06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
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 9aa50e19ee..09da88cad3 100644
|
|
--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
@@ -27,6 +27,13 @@
|
|
#include "rtc_base/synchronization/mutex.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;
|
|
@@ -268,7 +275,7 @@ void SharedScreenCastStreamPrivate::OnStreamParamChanged(
|
|
that->modifier_ =
|
|
has_modifier ? that->spa_video_format_.modifier : DRM_FORMAT_MOD_INVALID;
|
|
std::vector<const spa_pod*> params;
|
|
- 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);
|
|
|