In VideoCaptureModulePipeWire lock around started_
CaptureSettings() can read started_ on the api thread at any time. But
it is written and read in pipewire callbacks, on other threads. A lock
seems suitable.
Bug: webrtc:15181
Change-Id: I3d26f02408a4e56921b955f059e504ffa9b8cae9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306121
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40286}
diff --git a/modules/video_capture/linux/video_capture_pipewire.cc b/modules/video_capture/linux/video_capture_pipewire.cc
index c448e94..bb1babd 100644
--- a/modules/video_capture/linux/video_capture_pipewire.cc
+++ b/modules/video_capture/linux/video_capture_pipewire.cc
@@ -177,6 +177,8 @@
}
bool VideoCaptureModulePipeWire::CaptureStarted() {
+ MutexLock lock(&api_lock_);
+
return started_;
}
@@ -294,6 +296,7 @@
static_cast<VideoCaptureModulePipeWire*>(data);
RTC_DCHECK(that);
+ MutexLock lock(&that->api_lock_);
switch (state) {
case PW_STREAM_STATE_STREAMING:
that->started_ = true;
diff --git a/modules/video_capture/linux/video_capture_pipewire.h b/modules/video_capture/linux/video_capture_pipewire.h
index 5ce02d1..2cd6cca 100644
--- a/modules/video_capture/linux/video_capture_pipewire.h
+++ b/modules/video_capture/linux/video_capture_pipewire.h
@@ -46,7 +46,7 @@
rtc::scoped_refptr<PipeWireSession> session_;
int node_id_;
VideoCaptureCapability configured_capability_;
- bool started_;
+ bool started_ RTC_GUARDED_BY(api_lock_);
struct pw_stream* stream_;
struct spa_hook stream_listener_;
