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
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Mon, 6 May 2024 07:28:00 +0000
|
|
Subject: Bug 1892329 - Invert _captureThread check in
|
|
VideoCaptureModuleV4L2::StartCapture. r=webrtc-reviewers,mjf
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D208186
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6ed6737b8214bf664642eb17cbf66a8c8450e569
|
|
---
|
|
.../video_capture/linux/video_capture_v4l2.cc | 21 +++++++++++--------
|
|
1 file changed, 12 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/linux/video_capture_v4l2.cc b/modules/video_capture/linux/video_capture_v4l2.cc
|
|
index 74af348a6c..29ca864e19 100644
|
|
--- a/modules/video_capture/linux/video_capture_v4l2.cc
|
|
+++ b/modules/video_capture/linux/video_capture_v4l2.cc
|
|
@@ -303,16 +303,19 @@ int32_t VideoCaptureModuleV4L2::StartCapture(
|
|
}
|
|
|
|
// start capture thread;
|
|
- if (_captureThread.empty()) {
|
|
- quit_ = false;
|
|
- _captureThread = rtc::PlatformThread::SpawnJoinable(
|
|
- [self = scoped_refptr(this)] {
|
|
- while (self->CaptureProcess()) {
|
|
- }
|
|
- },
|
|
- "CaptureThread",
|
|
- rtc::ThreadAttributes().SetPriority(rtc::ThreadPriority::kHigh));
|
|
+ if (!_captureThread.empty()) {
|
|
+ return 0;
|
|
}
|
|
+
|
|
+ quit_ = false;
|
|
+
|
|
+ _captureThread = rtc::PlatformThread::SpawnJoinable(
|
|
+ [self = scoped_refptr(this)] {
|
|
+ while (self->CaptureProcess()) {
|
|
+ }
|
|
+ },
|
|
+ "CaptureThread",
|
|
+ rtc::ThreadAttributes().SetPriority(rtc::ThreadPriority::kHigh));
|
|
return 0;
|
|
}
|
|
|