Replace AudioConferenceMixer with AudioMixer.

webrtc/audio/audio_transport_proxy.h

Index: webrtc/audio/audio_transport_proxy.h
diff --git a/webrtc/audio/audio_transport_proxy.h b/webrtc/audio/audio_transport_proxy.h
index 05e52fce85cf1a90e1cc208e18cc472bea94d867..35f8b087a1605a954e4525041d004c9a5c759cdb 100644
--- a/webrtc/audio/audio_transport_proxy.h
+++ b/webrtc/audio/audio_transport_proxy.h
@@ -13,6 +13,8 @@
 
 #include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/logging.h"

[the sun, 2016/11/14 20:03:47]

Logging is not required here.

[aleloi, 2016/11/15 16:56:54]

Removed.

+#include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 
@@ -63,7 +65,11 @@ class AudioTransportProxy : public AudioTransport {
 
  private:
   AudioTransport* voe_audio_transport_;
+  AudioProcessing* apm_;
+  AudioMixer* mixer_;

[the sun, 2016/11/14 20:03:47]

This should be a scoped_refptr

[aleloi, 2016/11/15 16:56:54]

Done.

   AudioFrame frame_for_mixing_;

[the sun, 2016/11/14 20:03:47]

nit: how about "mixed_frame_"?

[aleloi, 2016/11/15 16:56:54]

Done.

+  // Converts mixed audio to the audio device output rate.
+  PushResampler<int16_t> resampler_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioTransportProxy);
 };