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
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Fri, 20 Aug 2021 13:52:00 +0200
|
|
Subject: Bug 1654112 - Don't check the calling thread in
|
|
webrtc::AudioReceiveStream::GetSources. r=ng
|
|
|
|
source_tracker_ is thread safe with its own internal mutex, so this call is safe
|
|
as long as the caller has a guarantee for the lifetime of the
|
|
AudioReceiveStream. This is similar to webrtc::VideoReceiveStream.
|
|
|
|
Upliftable.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D123226
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c186df8a088e46285a15e40149182daa34cc6805
|
|
---
|
|
audio/audio_receive_stream.cc | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc
|
|
index 6a918383ea..2c59db07d6 100644
|
|
--- a/audio/audio_receive_stream.cc
|
|
+++ b/audio/audio_receive_stream.cc
|
|
@@ -381,7 +381,6 @@ int AudioReceiveStreamImpl::GetBaseMinimumPlayoutDelayMs() const {
|
|
}
|
|
|
|
std::vector<RtpSource> AudioReceiveStreamImpl::GetSources() const {
|
|
- RTC_DCHECK_RUN_ON(&worker_thread_checker_);
|
|
return channel_receive_->GetSources();
|
|
}
|
|
|