| Index: webrtc/audio/audio_receive_stream.h
 | 
| diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
 | 
| index 871d48d6b0101472e6db82b63eaba408c5b9f8cd..98d78d0f4b00c217ef8dfc624dca77e8597e7720 100644
 | 
| --- a/webrtc/audio/audio_receive_stream.h
 | 
| +++ b/webrtc/audio/audio_receive_stream.h
 | 
| @@ -13,6 +13,7 @@
 | 
|  
 | 
|  #include <memory>
 | 
|  
 | 
| +#include "webrtc/api/audio/audio_mixer.h"
 | 
|  #include "webrtc/api/call/audio_receive_stream.h"
 | 
|  #include "webrtc/api/call/audio_state.h"
 | 
|  #include "webrtc/base/constructormagic.h"
 | 
| @@ -30,7 +31,8 @@ class ChannelProxy;
 | 
|  
 | 
|  namespace internal {
 | 
|  
 | 
| -class AudioReceiveStream final : public webrtc::AudioReceiveStream {
 | 
| +class AudioReceiveStream final : public webrtc::AudioReceiveStream,
 | 
| +                                 public AudioMixer::Source {
 | 
|   public:
 | 
|    AudioReceiveStream(CongestionController* congestion_controller,
 | 
|                       const webrtc::AudioReceiveStream::Config& config,
 | 
| @@ -52,6 +54,10 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream {
 | 
|                    const PacketTime& packet_time);
 | 
|    const webrtc::AudioReceiveStream::Config& config() const;
 | 
|  
 | 
| +  // AudioMixer::Source
 | 
| +  AudioFrameWithInfo GetAudioFrameWithInfo(int sample_rate_hz) override;
 | 
| +  int ssrc() override;
 | 
| +
 | 
|   private:
 | 
|    VoiceEngine* voice_engine() const;
 | 
|  
 | 
| 
 |