From 43feb9e5a20440317aca0768ff0e4331c8d2b0b1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 16 May 2022 08:10:49 +0200 Subject: [PATCH] Check PipeWire server version when dropping single modifier PipeWire server in older versions would mark the negotiation as finished and start creating buffers. Upstream bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1732 Bug: webrtc:13429 Change-Id: I7194e6672716d7fef1c2aadc40d3acf55cb282a2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262621 Reviewed-by: Alexander Cooper Commit-Queue: Alexander Cooper Cr-Commit-Position: refs/heads/main@{#36901} --- .../desktop_capture/linux/wayland/shared_screencast_stream.cc | 2 +- 1 file changed, 1 insertion(+), 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 a60b6abcdf..644569fd76 100644 --- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc @@ -599,7 +599,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) { RTC_LOG(LS_ERROR) << "Dropping DMA-BUF modifier: " << modifier_ << " and trying to renegotiate stream parameters"; - if (pw_client_version_ >= kDropSingleModifierMinVersion) { + if (pw_server_version_ >= kDropSingleModifierMinVersion) { modifiers_.erase( std::remove(modifiers_.begin(), modifiers_.end(), modifier_), modifiers_.end());