Made AudioReceiveStream a mixer participant.

webrtc/voice_engine/channel_proxy.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
 
+#include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_checker.h"
+#include "webrtc/base/race_checker.h"

[the sun, 2016/10/13 13:55:39]

nit: order

 #include "webrtc/voice_engine/channel_manager.h"
 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 namespace webrtc {
 
 class AudioSinkInterface;
@@ skipping 58 matching lines @@
                                  const PacketTime& packet_time);
   virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
 
   virtual const rtc::scoped_refptr<AudioDecoderFactory>&
       GetAudioDecoderFactory() const;
 
   virtual void SetChannelOutputVolumeScaling(float scaling);
 
   virtual void SetRtcEventLog(RtcEventLog* event_log);
 
+  virtual AudioMixer::Source::AudioFrameWithInfo GetAudioFrameWithInfo(
+      int sample_rate_hz);
+
  private:
   Channel* channel() const;
 
   rtc::ThreadChecker thread_checker_;
+  rtc::RaceChecker race_checker_;
   ChannelOwner channel_owner_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
 };
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_