| Index: webrtc/audio/audio_receive_stream.h
|
| diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
|
| index 20ed4613a7ede16d1ad3aa8897cb957c8c282c34..961794dfe5534bb01eee201cf73103d6252860ba 100644
|
| --- a/webrtc/audio/audio_receive_stream.h
|
| +++ b/webrtc/audio/audio_receive_stream.h
|
| @@ -19,7 +19,9 @@
|
| #include "webrtc/base/constructormagic.h"
|
| #include "webrtc/base/thread_checker.h"
|
| #include "webrtc/call/audio_receive_stream.h"
|
| +#include "webrtc/call/rtp_transport_controller_receive.h"
|
| #include "webrtc/call/syncable.h"
|
| +#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
|
|
|
| namespace webrtc {
|
| class PacketRouter;
|
| @@ -33,7 +35,8 @@ class ChannelProxy;
|
| namespace internal {
|
| class AudioSendStream;
|
|
|
| -class AudioReceiveStream final : public webrtc::AudioReceiveStream,
|
| +class AudioReceiveStream final : public webrtc::RtpPacketReceiverInterface,
|
| + public webrtc::AudioReceiveStream,
|
| public AudioMixer::Source,
|
| public Syncable {
|
| public:
|
| @@ -52,8 +55,8 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream,
|
| void SetGain(float gain) override;
|
| std::vector<webrtc::RtpSource> GetSources() const override;
|
|
|
| - // TODO(nisse): Intended to be part of an RtpPacketReceiver interface.
|
| - void OnRtpPacket(const RtpPacketReceived& packet);
|
| + // webrtc::RtpPacketReceiverInterface implementation
|
| + bool OnRtpPacketReceive(RtpPacketReceived* packet) override;
|
|
|
| // AudioMixer::Source
|
| AudioFrameInfo GetAudioFrameWithInfo(int sample_rate_hz,
|
| @@ -80,6 +83,8 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream,
|
| rtc::ThreadChecker worker_thread_checker_;
|
| rtc::ThreadChecker module_process_thread_checker_;
|
| const webrtc::AudioReceiveStream::Config config_;
|
| + RtpHeaderExtensionMap rtp_header_extensions_;
|
| +
|
| rtc::scoped_refptr<webrtc::AudioState> audio_state_;
|
| std::unique_ptr<voe::ChannelProxy> channel_proxy_;
|
|
|
|
|