Made AudioReceiveStream a mixer participant.

webrtc/voice_engine/channel_proxy.cc

Index: webrtc/voice_engine/channel_proxy.cc
diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc
index b7cfa9fd01e94fabf294133d7e4e5bfdce848473..462c505dc735e8eb723ec878cc1222b859010309 100644
--- a/webrtc/voice_engine/channel_proxy.cc
+++ b/webrtc/voice_engine/channel_proxy.cc
@@ -219,6 +219,13 @@ void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
   channel()->SetRtcpRttStats(rtcp_rtt_stats);
 }
 
+// From AudioMixer::Source

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

remove comment.

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

Done.

+AudioMixer::Source::AudioFrameWithInfo ChannelProxy::GetAudioFrameWithInfo(
+    int sample_rate_hz) {
+  RTC_DCHECK(mixer_callback_thread_checker_.CalledOnValidThread());
+  return channel()->GetAudioFrameWithInfo(sample_rate_hz);
+}
+
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
   return channel_owner_.channel();