Support external audio mixer.

webrtc/api/peerconnectioninterface.h

Index: webrtc/api/peerconnectioninterface.h
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index e14b79ca6c45258e7b7b9a623b453d34fb3e7916..e2cd597c6437447aa44c1e117349c506601f5573 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -86,6 +86,7 @@ class WebRtcVideoEncoderFactory;
 
 namespace webrtc {
 class AudioDeviceModule;
+class AudioMixer;
 class MediaConstraintsInterface;
 
 // MediaStream container interface.
@@ -535,6 +536,9 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
   // Terminates all media and closes the transport.
   virtual void Close() = 0;
 
+  // Get remote audio tracks' ssrcs.
+  virtual std::vector<uint32_t> GetRemoteAudioTrackSsrcs() = 0;
+
  protected:
   // Dtor protected as objects shouldn't be deleted via this interface.
   ~PeerConnectionInterface() {}
@@ -759,6 +763,20 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory);
 
+// Create a new instance of PeerConnectionFactoryInterface with external audio
+// mixer.
+//
+// If |audio_mixer| is null, an internal audio mixer will be created and used.
+rtc::scoped_refptr<PeerConnectionFactoryInterface>
+CreatePeerConnectionFactoryWithAudioMixer(
+    rtc::Thread* network_thread,
+    rtc::Thread* worker_thread,
+    rtc::Thread* signaling_thread,
+    AudioDeviceModule* default_adm,
+    cricket::WebRtcVideoEncoderFactory* encoder_factory,
+    cricket::WebRtcVideoDecoderFactory* decoder_factory,
+    rtc::scoped_refptr<AudioMixer> audio_mixer);
+
 // Create a new instance of PeerConnectionFactoryInterface.
 // Same thread is used as worker and network thread.
 inline rtc::scoped_refptr<PeerConnectionFactoryInterface>
@@ -773,6 +791,8 @@ CreatePeerConnectionFactory(
       default_adm, encoder_factory, decoder_factory);
 }
 
+

[the sun, 2016/12/07 15:56:08]

remove space

[GeorgeZ, 2016/12/07 18:28:17]

Done.

+
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_PEERCONNECTIONINTERFACE_H_