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
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From: stransky <stransky@redhat.com>
|
|
Date: Tue, 29 Aug 2023 12:43:00 +0000
|
|
Subject: Bug 1821629 [Pipewire/DMABuf] Don't create dmabuf backend if it's
|
|
disabled r=ng,webrtc-reviewers
|
|
|
|
Depends on D172224
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D172229
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/237d19fe96dd7d25b6a817415ee4e6854678d648
|
|
---
|
|
.../linux/wayland/shared_screencast_stream.cc | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
index 09da88cad3..f98253de2d 100644
|
|
--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
|
|
@@ -406,7 +406,9 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream(
|
|
RTC_LOG(LS_ERROR) << "Unable to open PipeWire library";
|
|
return false;
|
|
}
|
|
- egl_dmabuf_ = std::make_unique<EglDmaBuf>();
|
|
+ if (mozilla::gfx::IsDMABufEnabled()) {
|
|
+ egl_dmabuf_ = std::make_unique<EglDmaBuf>();
|
|
+ }
|
|
|
|
pw_stream_node_id_ = stream_node_id;
|
|
|
|
@@ -495,7 +497,8 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream(
|
|
for (uint32_t format : {SPA_VIDEO_FORMAT_BGRA, SPA_VIDEO_FORMAT_RGBA,
|
|
SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx}) {
|
|
// Modifiers can be used with PipeWire >= 0.3.33
|
|
- if (has_required_pw_client_version && has_required_pw_server_version) {
|
|
+ if (egl_dmabuf_ &&
|
|
+ has_required_pw_client_version && has_required_pw_server_version) {
|
|
modifiers_ = egl_dmabuf_->QueryDmaBufModifiers(format);
|
|
|
|
if (!modifiers_.empty()) {
|
|
@@ -938,7 +941,7 @@ bool SharedScreenCastStreamPrivate::ProcessDMABuffer(
|
|
|
|
const uint n_planes = spa_buffer->n_datas;
|
|
|
|
- if (!n_planes) {
|
|
+ if (!n_planes || !egl_dmabuf_) {
|
|
return false;
|
|
}
|
|
|