Chromium Code Reviews| Index: webrtc/api/peerconnectionfactory.h |
| diff --git a/webrtc/api/peerconnectionfactory.h b/webrtc/api/peerconnectionfactory.h |
| index 7a30ab4569024879a336cd7dadcd378a77c7effe..692d38faf4564077925b063d61ed0347d5824be9 100644 |
| --- a/webrtc/api/peerconnectionfactory.h |
| +++ b/webrtc/api/peerconnectionfactory.h |
| @@ -111,7 +111,8 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| audio_decoder_factory, |
| cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
| - cricket::WebRtcVideoDecoderFactory* video_decoder_factory); |
| + cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
| + rtc::scoped_refptr<AudioMixer> audio_mixer); |
| virtual ~PeerConnectionFactory(); |
| private: |
| @@ -135,6 +136,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; |
| std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; |
| std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; |
| + rtc::scoped_refptr<AudioMixer> external_audio_mixer_; |
|
aleloi
2016/12/05 14:03:08
Please add comment describing what happens if this
GeorgeZ
2016/12/05 17:56:18
Done.
|
| }; |
| } // namespace webrtc |