Chromium Code Reviews| Index: talk/app/webrtc/peerconnectionfactory.h |
| diff --git a/talk/app/webrtc/peerconnectionfactory.h b/talk/app/webrtc/peerconnectionfactory.h |
| index c5855f452b76cc4be2be35d3e6e7c91c5d0d2ef6..cfb0a2a60f175bfd7dfb8ad8c00ef924d1f7492d 100644 |
| --- a/talk/app/webrtc/peerconnectionfactory.h |
| +++ b/talk/app/webrtc/peerconnectionfactory.h |
| @@ -31,6 +31,7 @@ |
| #include <string> |
| #include "talk/app/webrtc/dtlsidentitystore.h" |
| +#include "talk/app/webrtc/mediacontroller.h" |
| #include "talk/app/webrtc/mediastreaminterface.h" |
| #include "talk/app/webrtc/peerconnectioninterface.h" |
| #include "talk/session/media/channelmanager.h" |
| @@ -80,7 +81,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| bool StartAecDump(rtc::PlatformFile file) override; |
| - virtual cricket::ChannelManager* channel_manager(); |
| + virtual webrtc::MediaControllerInterface* media_controller() const; |
| virtual rtc::Thread* signaling_thread(); |
| virtual rtc::Thread* worker_thread(); |
| const Options& options() const { return options_; } |
| @@ -107,6 +108,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| // External Audio device used for audio playback. |
| rtc::scoped_refptr<AudioDeviceModule> default_adm_; |
| rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; |
| + rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_; |
|
pthatcher1
2015/10/13 05:31:13
I think there's a problem here. A MediaController
stefan-webrtc
2015/10/13 08:09:20
Yes, sorry about that... I must have stopped think
|
| // External Video encoder factory. This can be NULL if the client has not |
| // injected any. In that case, video engine will use the internal SW encoder. |
| rtc::scoped_ptr<cricket::WebRtcVideoEncoderFactory> |