| Index: webrtc/voice_engine/channel_proxy.h
|
| diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h
|
| index 829b094cc686686d3ffc85dda52e9fa7611c04e0..1bc9ab3af3d694bfe9bffd72da92cfd74fd9fd1d 100644
|
| --- a/webrtc/voice_engine/channel_proxy.h
|
| +++ b/webrtc/voice_engine/channel_proxy.h
|
| @@ -16,6 +16,7 @@
|
| #include "webrtc/base/constructormagic.h"
|
| #include "webrtc/base/race_checker.h"
|
| #include "webrtc/base/thread_checker.h"
|
| +#include "webrtc/call/rtp_transport_controller_receive.h"
|
| #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
|
| #include "webrtc/voice_engine/channel_manager.h"
|
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
| @@ -50,7 +51,7 @@ class Channel;
|
| // voe::Channel class.
|
| // 2. Provide a refined interface for the stream classes, including assumptions
|
| // on return values and input adaptation.
|
| -class ChannelProxy {
|
| +class ChannelProxy : public RtpPacketSinkInterface {
|
| public:
|
| ChannelProxy();
|
| explicit ChannelProxy(const ChannelOwner& channel_owner);
|
| @@ -64,9 +65,7 @@ class ChannelProxy {
|
| virtual void SetRTCP_CNAME(const std::string& c_name);
|
| virtual void SetNACKStatus(bool enable, int max_packets);
|
| virtual void SetSendAudioLevelIndicationStatus(bool enable, int id);
|
| - virtual void SetReceiveAudioLevelIndicationStatus(bool enable, int id);
|
| virtual void EnableSendTransportSequenceNumber(int id);
|
| - virtual void EnableReceiveTransportSequenceNumber(int id);
|
| virtual void RegisterSenderCongestionControlObjects(
|
| RtpTransportControllerSendInterface* transport,
|
| RtcpBandwidthObserver* bandwidth_observer);
|
| @@ -92,7 +91,8 @@ class ChannelProxy {
|
| virtual void SetInputMute(bool muted);
|
| virtual void RegisterExternalTransport(Transport* transport);
|
| virtual void DeRegisterExternalTransport();
|
| - virtual void OnRtpPacket(const RtpPacketReceived& packet);
|
| + // RtpPacketSinkInterface implementation.
|
| + void OnRtpPacket(const RtpPacketReceived& packet) override;
|
| virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
|
| virtual const rtc::scoped_refptr<AudioDecoderFactory>&
|
| GetAudioDecoderFactory() const;
|
|
|