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
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Wed, 18 Oct 2023 17:21:00 +0000
|
|
Subject: Bug 1859786 - Fix lock annotation warning in Mozilla-specific edit on
|
|
top of video_capture_impl.cc. r=webrtc-reviewers,mjf
|
|
|
|
The annotations were added in M116:
|
|
https://hg.mozilla.org/mozilla-central/rev/9cd372df013948ad822ae936752d725d77474fb5
|
|
|
|
Note that this was never unsafe, since _dataCallbacks is only written on the
|
|
same thread that we are patching here. This patch however, adds helpful static
|
|
analysis.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D191301
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/56ff441b644400f09d2d0453dbd8991ea25db7b1
|
|
---
|
|
modules/video_capture/video_capture_impl.cc | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc
|
|
index 1a12020b64..dad8bee1f8 100644
|
|
--- a/modules/video_capture/video_capture_impl.cc
|
|
+++ b/modules/video_capture/video_capture_impl.cc
|
|
@@ -119,11 +119,14 @@ void VideoCaptureImpl::DeRegisterCaptureDataCallback(
|
|
}
|
|
|
|
int32_t VideoCaptureImpl::StopCaptureIfAllClientsClose() {
|
|
- if (_dataCallBacks.empty()) {
|
|
- return StopCapture();
|
|
- } else {
|
|
- return 0;
|
|
+ RTC_DCHECK_RUN_ON(&api_checker_);
|
|
+ {
|
|
+ MutexLock lock(&api_lock_);
|
|
+ if (!_dataCallBacks.empty()) {
|
|
+ return 0;
|
|
+ }
|
|
}
|
|
+ return StopCapture();
|
|
}
|
|
|
|
int32_t VideoCaptureImpl::DeliverCapturedFrame(VideoFrame& captureFrame) {
|