Chromium Code Reviews| Index: webrtc/voice_engine/channel_proxy.h |
| diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h |
| index d964bd4b5e0ca80f0f14bb7750e3d70c6fd8daac..0d06e5b025df5a5e0d2d62d8e8efd714edf34321 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/modules/audio_coding/codecs/audio_encoder.h" |
| #include "webrtc/voice_engine/channel_manager.h" |
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" |
| @@ -49,7 +50,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 { |
|
the sun
2017/04/18 09:59:00
No, I don't think you should register the ChannelP
nisse-webrtc
2017/04/19 08:35:43
I'll give it a try.
|
| public: |
| ChannelProxy(); |
| explicit ChannelProxy(const ChannelOwner& channel_owner); |
| @@ -63,9 +64,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); |
| @@ -91,7 +90,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; |