jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

sinkclient: add the ability to disable shm via libwrap

Browse Source 
This allow to generate jamid for dbus usage and client-qt with
libwrap.

Change-Id: Ia23a0cec2efb4347166e0123c662da6c134c2238
GitLab: https://git.jami.net/savoirfairelinux/jami-project/-/issues/1312
This commit is contained in:
Sébastien Blin
2021-12-02 10:44:52 -05:00
parent cc8fb02462
commit de0b797836
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/media/video/sinkclient.cpp
View File

@ -278,6 +278,9 @@ SinkClient::start() noexcept
{
if (not shm_) {
try {
char* envvar = getenv("JAMI_DISABLE_SHM");
if (envvar) // Do not use SHM if set
return true;
shm_ = std::make_shared<ShmHolder>();
JAMI_DBG("[Sink:%p] Shared memory [%s] created", this, openedName().c_str());
} catch (const std::runtime_error& e) {
@ -379,7 +382,7 @@ SinkClient::update(Observable<std::shared_ptr<MediaFrame>>* /*obs*/,
std::shared_ptr<VideoFrame> frame = std::make_shared<VideoFrame>();
#ifdef RING_ACCEL
auto desc = av_pix_fmt_desc_get(
(AVPixelFormat)(std::static_pointer_cast<VideoFrame>(frame_p))->format());
(AVPixelFormat) (std::static_pointer_cast<VideoFrame>(frame_p))->format());
if (desc && (desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
try {
frame = HardwareAccel::transferToMainMemory(*std::static_pointer_cast<VideoFrame>(
@ -426,7 +429,8 @@ SinkClient::update(Observable<std::shared_ptr<MediaFrame>>* /*obs*/,
return;
}
#if HAVE_SHM
shm_->renderFrame(*frame);
if (shm_)
shm_->renderFrame(*frame);
#endif
if (target_.pull) {
int width = frame->width();