Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: webrtc/pc/peerconnectionfactory.cc

Issue 2934103002: Allow WebRtcMediaEngine to be created from any thread. (Closed)
Patch Set: Adding DCHECK for encoder_factory Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/peerconnectionfactory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectionfactory.cc
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 777bac1eb59aadd49bcc9af1d44ac66e9d02276f..bf2f70d6b426501220cdd6411a92a5d32ec8116c 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -210,10 +210,11 @@ bool PeerConnectionFactory::Initialize() {
return false;
}
- std::unique_ptr<cricket::MediaEngineInterface> media_engine =
- worker_thread_->Invoke<std::unique_ptr<cricket::MediaEngineInterface>>(
- RTC_FROM_HERE,
- rtc::Bind(&PeerConnectionFactory::CreateMediaEngine_w, this));
+ std::unique_ptr<cricket::MediaEngineInterface> media_engine(
+ cricket::WebRtcMediaEngineFactory::Create(
+ default_adm_.get(), audio_encoder_factory_, audio_decoder_factory_,
+ video_encoder_factory_.get(), video_decoder_factory_.get(),
+ external_audio_mixer_));
channel_manager_.reset(new cricket::ChannelManager(
std::move(media_engine), worker_thread_, network_thread_));
@@ -382,15 +383,4 @@ rtc::Thread* PeerConnectionFactory::network_thread() {
return network_thread_;
}
-std::unique_ptr<cricket::MediaEngineInterface>
-PeerConnectionFactory::CreateMediaEngine_w() {
- RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
- return std::unique_ptr<cricket::MediaEngineInterface>(
- cricket::WebRtcMediaEngineFactory::Create(
- default_adm_.get(), audio_encoder_factory_,
- audio_decoder_factory_,
- video_encoder_factory_.get(), video_decoder_factory_.get(),
- external_audio_mixer_));
-}
-
} // namespace webrtc
« no previous file with comments | « webrtc/pc/peerconnectionfactory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698