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

Unified Diff: webrtc/pc/peerconnectionfactory.h

Issue 2942503002: Detailed description will be added. (Closed)
Patch Set: Suggested changes to comments 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/peerconnection.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectionfactory.h
diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h
index 0bf05bd714dcee95430b89f85d08cb2487e04f2e..938cda29c6a2ed33d8d42d4921edb8ecf40a5916 100644
--- a/webrtc/pc/peerconnectionfactory.h
+++ b/webrtc/pc/peerconnectionfactory.h
@@ -105,9 +105,14 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
const Options& options() const { return options_; }
protected:
+ // Deprecated. Use the method with media_engine, call_factory_, and
+ // event_log_factory instead.
PeerConnectionFactory(
rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory);
+
+ // Deprecated. Use the method with media_engine, call_factory_, and
+ // event_log_factory instead.
PeerConnectionFactory(
rtc::Thread* network_thread,
rtc::Thread* worker_thread,
@@ -118,10 +123,24 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
rtc::scoped_refptr<AudioMixer> audio_mixer);
+
+ PeerConnectionFactory(
+ rtc::Thread* network_thread,
+ rtc::Thread* worker_thread,
+ rtc::Thread* signaling_thread,
+ AudioDeviceModule* default_adm,
+ rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
+ rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
+ cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
+ cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
+ 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:
- std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w();
+ std::unique_ptr<Call> CreateCall_w(RtcEventLog* event_log);
bool owns_ptrs_;
bool wraps_current_thread_;
@@ -145,6 +164,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
« no previous file with comments | « webrtc/pc/peerconnection.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698