From 2aeab5ed3f56896a61f5c92a2b1e808d551d2d0f Mon Sep 17 00:00:00 2001 From: Tomas Gunnarsson Date: Tue, 23 Feb 2021 21:36:14 +0100 Subject: [PATCH] Make the PC proxy invoke LookupDtlsTransportByMid on the network thread Bug: webrtc:12489 Change-Id: I786c968e4ee07c9bbce4a1c850a6f8f0c55810c0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208580 Reviewed-by: Niels Moller Commit-Queue: Tommi Cr-Commit-Position: refs/heads/master@{#33345} --- api/peer_connection_proxy.h | 8 +++++--- pc/peer_connection.cc | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/peer_connection_proxy.h b/api/peer_connection_proxy.h index 5c1d4b768a..43802f11e7 100644 --- a/api/peer_connection_proxy.h +++ b/api/peer_connection_proxy.h @@ -133,9 +133,11 @@ PROXY_METHOD1(bool, RemoveIceCandidates, const std::vector&) PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&) PROXY_METHOD1(void, SetAudioPlayout, bool) PROXY_METHOD1(void, SetAudioRecording, bool) -PROXY_METHOD1(rtc::scoped_refptr, - LookupDtlsTransportByMid, - const std::string&) +// This method will be invoked on the network thread. See +// PeerConnectionFactory::CreatePeerConnectionOrError for more details. +PROXY_WORKER_METHOD1(rtc::scoped_refptr, + LookupDtlsTransportByMid, + const std::string&) // This method will be invoked on the network thread. See // PeerConnectionFactory::CreatePeerConnectionOrError for more details. PROXY_WORKER_CONSTMETHOD0(rtc::scoped_refptr, diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc index a340f9845d..1766bf5163 100644 --- a/pc/peer_connection.cc +++ b/pc/peer_connection.cc @@ -1629,8 +1629,7 @@ void PeerConnection::StopRtcEventLog() { rtc::scoped_refptr PeerConnection::LookupDtlsTransportByMid(const std::string& mid) { - RTC_DCHECK_RUN_ON(signaling_thread()); - // TODO(tommi): Move to the network thread - this hides an invoke. + RTC_DCHECK_RUN_ON(network_thread()); return transport_controller_->LookupDtlsTransportByMid(mid); }