Source code
Revision control
Copy as Markdown
Other Tools
From: stransky <stransky@redhat.com>
Date: Tue, 29 Aug 2023 12:43:00 +0000
Subject: Bug 1821629 [DMABuf] Don't use DMABuf if it's disabled by Firefox gfx
config r=ng,webrtc-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D172224
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/158a888cad8869a2f0026fa7cfaaa13ecbfcf2ed
---
.../linux/wayland/shared_screencast_stream.cc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
index 070257f072..47c8626a81 100644
--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
@@ -60,6 +60,13 @@
#include "rtc_base/thread_annotations.h"
#include "rtc_base/time_utils.h"
+// Wrapper for gfxVars::UseDMABuf() as we can't include gfxVars here.
+// We don't want to use dmabuf of known broken systems.
+// See FEATURE_DMABUF for details.
+namespace mozilla::gfx {
+bool IsDMABufEnabled();
+}
+
namespace webrtc {
const int kBytesPerPixel = 4;
@@ -332,7 +339,7 @@ void SharedScreenCastStreamPrivate::OnStreamParamChanged(
RTC_LOG(LS_INFO) << sb.str();
}
- const int buffer_types = has_modifier
+ const int buffer_types = has_modifier && mozilla::gfx::IsDMABufEnabled()
? (1 << SPA_DATA_DmaBuf) | (1 << SPA_DATA_MemFd)
: (1 << SPA_DATA_MemFd);