diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc index dda0eebb07..581159f13a 100644 --- a/webrtc/api/peerconnection.cc +++ b/webrtc/api/peerconnection.cc @@ -559,8 +559,8 @@ PeerConnection::~PeerConnection() { // because its destruction fires signals (such as VoiceChannelDestroyed) // which will trigger some final actions in PeerConnection... session_.reset(nullptr); - // port_allocator_ lives on the worker thread and should be destroyed there. - worker_thread()->Invoke([this] { port_allocator_.reset(nullptr); }); + // port_allocator_ lives on the network thread and should be destroyed there. + network_thread()->Invoke([this] { port_allocator_.reset(nullptr); }); } bool PeerConnection::Initialize( @@ -577,10 +577,10 @@ bool PeerConnection::Initialize( port_allocator_ = std::move(allocator); - // The port allocator lives on the worker thread and should be initialized + // The port allocator lives on the network thread and should be initialized // there. - if (!worker_thread()->Invoke(rtc::Bind( - &PeerConnection::InitializePortAllocator_w, this, configuration))) { + if (!network_thread()->Invoke(rtc::Bind( + &PeerConnection::InitializePortAllocator_n, this, configuration))) { return false; } @@ -1164,8 +1164,8 @@ void PeerConnection::SetRemoteDescription( bool PeerConnection::SetConfiguration(const RTCConfiguration& configuration) { TRACE_EVENT0("webrtc", "PeerConnection::SetConfiguration"); if (port_allocator_) { - if (!worker_thread()->Invoke( - rtc::Bind(&PeerConnection::ReconfigurePortAllocator_w, this, + if (!network_thread()->Invoke( + rtc::Bind(&PeerConnection::ReconfigurePortAllocator_n, this, configuration))) { return false; } @@ -2088,7 +2088,7 @@ DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { return nullptr; } -bool PeerConnection::InitializePortAllocator_w( +bool PeerConnection::InitializePortAllocator_n( const RTCConfiguration& configuration) { cricket::ServerAddresses stun_servers; std::vector turn_servers; @@ -2128,7 +2128,7 @@ bool PeerConnection::InitializePortAllocator_w( return true; } -bool PeerConnection::ReconfigurePortAllocator_w( +bool PeerConnection::ReconfigurePortAllocator_n( const RTCConfiguration& configuration) { cricket::ServerAddresses stun_servers; std::vector turn_servers; diff --git a/webrtc/api/peerconnection.h b/webrtc/api/peerconnection.h index 8ba7e58372..cf9e3b9338 100644 --- a/webrtc/api/peerconnection.h +++ b/webrtc/api/peerconnection.h @@ -209,7 +209,7 @@ class PeerConnection : public PeerConnectionInterface, return factory_->signaling_thread(); } - rtc::Thread* worker_thread() const { return factory_->worker_thread(); } + rtc::Thread* network_thread() const { return factory_->network_thread(); } void PostSetSessionDescriptionFailure(SetSessionDescriptionObserver* observer, const std::string& error); @@ -353,10 +353,10 @@ class PeerConnection : public PeerConnectionInterface, DataChannel* FindDataChannelBySid(int sid) const; // Called when first configuring the port allocator. - bool InitializePortAllocator_w(const RTCConfiguration& configuration); + bool InitializePortAllocator_n(const RTCConfiguration& configuration); // Called when SetConfiguration is called. Only a subset of the configuration // is applied. - bool ReconfigurePortAllocator_w(const RTCConfiguration& configuration); + bool ReconfigurePortAllocator_n(const RTCConfiguration& configuration); // Storing the factory as a scoped reference pointer ensures that the memory // in the PeerConnectionFactoryImpl remains available as long as the diff --git a/webrtc/api/peerconnectionfactory.cc b/webrtc/api/peerconnectionfactory.cc index 9cb5b46785..a91589a98a 100644 --- a/webrtc/api/peerconnectionfactory.cc +++ b/webrtc/api/peerconnectionfactory.cc @@ -287,7 +287,7 @@ PeerConnectionFactory::CreatePeerConnection( allocator.reset(new cricket::BasicPortAllocator( default_network_manager_.get(), default_socket_factory_.get())); } - worker_thread_->Invoke( + network_thread_->Invoke( rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(), options_.network_ignore_mask));