Index: webrtc/pc/peerconnectionfactory.h |
diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h |
index 58d3e7f54c603fb2999513660d8882e91ea8a3d7..c93594db62f353d80b04f17da342e88615d91ea1 100644 |
--- a/webrtc/pc/peerconnectionfactory.h |
+++ b/webrtc/pc/peerconnectionfactory.h |
@@ -105,9 +105,6 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
const Options& options() const { return options_; } |
protected: |
- PeerConnectionFactory( |
- rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
- rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory); |
PeerConnectionFactory( |
rtc::Thread* network_thread, |
rtc::Thread* worker_thread, |
@@ -117,15 +114,21 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, |
cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
- rtc::scoped_refptr<AudioMixer> audio_mixer); |
+ rtc::scoped_refptr<AudioMixer> audio_mixer, |
+ std::unique_ptr<cricket::MediaEngineInterface> media_engine, |
+ std::unique_ptr<webrtc::CallFactoryInterface> call_factory, |
+ std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); |
virtual ~PeerConnectionFactory(); |
private: |
- bool owns_ptrs_; |
+ std::unique_ptr<Call> CreateCall_w(RtcEventLog* event_log); |
+ |
bool wraps_current_thread_; |
rtc::Thread* network_thread_; |
rtc::Thread* worker_thread_; |
rtc::Thread* signaling_thread_; |
+ std::unique_ptr<rtc::Thread> owned_network_thread_; |
+ std::unique_ptr<rtc::Thread> owned_worker_thread_; |
Options options_; |
// External Audio device used for audio playback. |
rtc::scoped_refptr<AudioDeviceModule> default_adm_; |
@@ -143,6 +146,9 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
// External audio mixer. This can be NULL. In that case, internal audio mixer |
// will be created and used. |
rtc::scoped_refptr<AudioMixer> external_audio_mixer_; |
+ std::unique_ptr<cricket::MediaEngineInterface> media_engine_; |
+ std::unique_ptr<webrtc::CallFactoryInterface> call_factory_; |
+ std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_; |
}; |
} // namespace webrtc |