29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Mon, 6 May 2024 07:28:00 +0000
|
|
Subject: Bug 1892329 - Revert bug 1892045 (changeset 0b54a6f17243).
|
|
r=webrtc-reviewers,mjf
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D208185
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8ba14327877a0428a0eaf018d71579f2441ac7ac
|
|
---
|
|
modules/video_capture/linux/video_capture_v4l2.cc | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/linux/video_capture_v4l2.cc b/modules/video_capture/linux/video_capture_v4l2.cc
|
|
index e3061556e8..74af348a6c 100644
|
|
--- a/modules/video_capture/linux/video_capture_v4l2.cc
|
|
+++ b/modules/video_capture/linux/video_capture_v4l2.cc
|
|
@@ -304,12 +304,7 @@ int32_t VideoCaptureModuleV4L2::StartCapture(
|
|
|
|
// start capture thread;
|
|
if (_captureThread.empty()) {
|
|
- {
|
|
- // Probably can't be accessed from another thread with
|
|
- // _captureThread empty, but the analyzer doesn't know this
|
|
- MutexLock lock(&capture_lock_);
|
|
- quit_ = false;
|
|
- }
|
|
+ quit_ = false;
|
|
_captureThread = rtc::PlatformThread::SpawnJoinable(
|
|
[self = scoped_refptr(this)] {
|
|
while (self->CaptureProcess()) {
|