| Index: webrtc/voice_engine/channel_proxy.h
|
| diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h
|
| index 28d036446a295a87c8f1ccd62c713a0f201d1f66..140482ae9fe92b82d4d60b89d43da8e536b72643 100644
|
| --- a/webrtc/voice_engine/channel_proxy.h
|
| +++ b/webrtc/voice_engine/channel_proxy.h
|
| @@ -15,6 +15,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/voice_engine/channel_manager.h"
|
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
|
|
| @@ -47,7 +48,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);
|
| @@ -58,9 +59,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(
|
| RtpPacketSender* rtp_packet_sender,
|
| TransportFeedbackObserver* transport_feedback_observer,
|
| @@ -86,7 +85,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;
|
|
|