Made AudioReceiveStream a mixer participant.

webrtc/voice_engine/channel.h

Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index fc123e384f750df1bb9ec394dbcc1cb42a7a692f..b137fea22deeb543b6d0ecf66a7a33b3805190dd 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -13,6 +13,7 @@
 
 #include <memory>
 
+#include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/api/call/audio_sink.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/optional.h"
@@ -378,6 +379,10 @@ class Channel
       AudioFrame* audioFrame) override;
   int32_t NeededFrequency(int32_t id) const override;
 
+  // From AudioMixer::Source

[the sun, 2016/10/13 12:16:56]

total nit: comments should en with a "."

[aleloi, 2016/10/13 13:34:55]

Done.

+  AudioMixer::Source::AudioFrameWithInfo GetAudioFrameWithInfo(
+      int sample_rate_hz);
+
   // From FileCallback
   void PlayNotification(int32_t id, uint32_t durationMs) override;
   void RecordNotification(int32_t id, uint32_t durationMs) override;
@@ -474,6 +479,7 @@ class Channel
   AudioLevel _outputAudioLevel;
   bool _externalTransport;
   AudioFrame _audioFrame;
+  AudioFrame mix_audio_frame_;
   // Downsamples to the codec rate if necessary.
   PushResampler<int16_t> input_resampler_;
   std::unique_ptr<FilePlayer> input_file_player_;