Index: webrtc/pc/createpeerconnectionfactory.cc |
diff --git a/webrtc/pc/createpeerconnectionfactory.cc b/webrtc/pc/createpeerconnectionfactory.cc |
index 11aa1213a214a9673c7fbfe7974392b6997c5b41..051106644d0d73a11da335d293be7de250fa2317 100644 |
--- a/webrtc/pc/createpeerconnectionfactory.cc |
+++ b/webrtc/pc/createpeerconnectionfactory.cc |
@@ -74,6 +74,40 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
std::move(call_factory), std::move(event_log_factory)); |
} |
+rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
+ rtc::Thread* network_thread, |
+ rtc::Thread* worker_thread, |
+ rtc::Thread* signaling_thread, |
+ rtc::scoped_refptr<AudioDeviceModule> default_adm, |
+ rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory, |
+ rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, |
+ std::unique_ptr<VideoEncoderFactory> video_encoder_factory, |
+ std::unique_ptr<VideoDecoderFactory> video_decoder_factory, |
+ rtc::scoped_refptr<AudioMixer> audio_mixer, |
+ rtc::scoped_refptr<AudioProcessing> audio_processing) { |
+ if (!audio_processing) |
+ audio_processing = AudioProcessing::Create(); |
+ |
+ std::unique_ptr<cricket::MediaEngineInterface> media_engine = |
+ cricket::WebRtcMediaEngineFactory::Create( |
+ default_adm, audio_encoder_factory, audio_decoder_factory, |
+ std::move(video_encoder_factory), std::move(video_decoder_factory), |
+ audio_mixer, audio_processing); |
+ |
+ std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory(); |
+ |
+ std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory = |
+ CreateRtcEventLogFactory(); |
+ |
+ return CreateModularPeerConnectionFactory( |
+ network_thread, worker_thread, signaling_thread, default_adm, |
+ audio_encoder_factory, audio_decoder_factory, |
Taylor Brandstetter
2017/09/15 00:42:51
Something I'm realizing now: the audio_encoder_fac
magjed_webrtc
2017/09/15 13:39:16
Yeah, it looks strange but I haven't been working
|
+ nullptr /* external_video_encoder_factory */, |
+ nullptr /* external_video_decoder_factory */, audio_mixer, |
+ std::move(media_engine), std::move(call_factory), |
+ std::move(event_log_factory)); |
+} |
+ |
rtc::scoped_refptr<PeerConnectionFactoryInterface> |
CreatePeerConnectionFactoryWithAudioMixer( |
rtc::Thread* network_thread, |