diff --git a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h index 9980843961..40c8b9e832 100644 --- a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h +++ b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h @@ -355,7 +355,7 @@ class NullRtpData : public RtpData { } virtual bool OnRecoveredPacket(const uint8_t* packet, - int packet_length) { + int packet_length) OVERRIDE { return true; } }; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc index 63fc6a686f..764e9acfe2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc @@ -96,10 +96,6 @@ RtpReceiverImpl::~RtpReceiverImpl() { } } -RTPReceiverStrategy* RtpReceiverImpl::GetMediaReceiver() const { - return rtp_media_receiver_.get(); -} - int32_t RtpReceiverImpl::RegisterReceivePayload( const char payload_name[RTP_PAYLOAD_NAME_SIZE], const int8_t payload_type, diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h index 7fd20bf4ab..60688118f5 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -34,47 +34,38 @@ class RtpReceiverImpl : public RtpReceiver { virtual ~RtpReceiverImpl(); - RTPReceiverStrategy* GetMediaReceiver() const; - - int32_t RegisterReceivePayload( + virtual int32_t RegisterReceivePayload( const char payload_name[RTP_PAYLOAD_NAME_SIZE], const int8_t payload_type, const uint32_t frequency, const uint8_t channels, - const uint32_t rate); + const uint32_t rate) OVERRIDE; - int32_t DeRegisterReceivePayload(const int8_t payload_type); + virtual int32_t DeRegisterReceivePayload(const int8_t payload_type) OVERRIDE; - bool IncomingRtpPacket( + virtual bool IncomingRtpPacket( const RTPHeader& rtp_header, const uint8_t* payload, int payload_length, PayloadUnion payload_specific, - bool in_order); + bool in_order) OVERRIDE; - NACKMethod NACK() const; + virtual NACKMethod NACK() const OVERRIDE; // Turn negative acknowledgement requests on/off. - void SetNACKStatus(const NACKMethod method); + virtual void SetNACKStatus(const NACKMethod method) OVERRIDE; // Returns the last received timestamp. - bool Timestamp(uint32_t* timestamp) const; - bool LastReceivedTimeMs(int64_t* receive_time_ms) const; + virtual bool Timestamp(uint32_t* timestamp) const OVERRIDE; + virtual bool LastReceivedTimeMs(int64_t* receive_time_ms) const OVERRIDE; - uint32_t SSRC() const; + virtual uint32_t SSRC() const OVERRIDE; - int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const; + virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const OVERRIDE; - int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const; + virtual int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const OVERRIDE; - // RTX. - void SetRTXStatus(bool enable, uint32_t ssrc); - - void RTXStatus(bool* enable, uint32_t* ssrc, int* payload_type) const; - - void SetRtxPayloadType(int payload_type); - - TelephoneEventHandler* GetTelephoneEventHandler(); + virtual TelephoneEventHandler* GetTelephoneEventHandler() OVERRIDE; private: bool HaveReceivedFrame() const; diff --git a/webrtc/modules/video_coding/main/test/receiver_tests.h b/webrtc/modules/video_coding/main/test/receiver_tests.h index ca276e9c5f..91b7f8e54b 100644 --- a/webrtc/modules/video_coding/main/test/receiver_tests.h +++ b/webrtc/modules/video_coding/main/test/receiver_tests.h @@ -30,7 +30,7 @@ class RtpDataCallback : public webrtc::NullRtpData { virtual int32_t OnReceivedPayloadData( const uint8_t* payload_data, const uint16_t payload_size, - const webrtc::WebRtcRTPHeader* rtp_header) { + const webrtc::WebRtcRTPHeader* rtp_header) OVERRIDE { return vcm_->IncomingPacket(payload_data, payload_size, *rtp_header); } diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc index ebd6f0546c..aa636a0816 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc +++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc @@ -54,19 +54,19 @@ class VcmPayloadSinkFactory::VcmPayloadSink virtual int32_t OnReceivedPayloadData( const uint8_t* payload_data, const uint16_t payload_size, - const WebRtcRTPHeader* rtp_header) { + const WebRtcRTPHeader* rtp_header) OVERRIDE { return vcm_->IncomingPacket(payload_data, payload_size, *rtp_header); } virtual bool OnRecoveredPacket(const uint8_t* packet, - int packet_length) { + int packet_length) OVERRIDE { // We currently don't handle FEC. return true; } // VCMPacketRequestCallback virtual int32_t ResendPackets(const uint16_t* sequence_numbers, - uint16_t length) { + uint16_t length) OVERRIDE { stream_->ResendPackets(sequence_numbers, length); return 0; } diff --git a/webrtc/video_engine/vie_receiver.h b/webrtc/video_engine/vie_receiver.h index 817caddbc4..3451d5246b 100644 --- a/webrtc/video_engine/vie_receiver.h +++ b/webrtc/video_engine/vie_receiver.h @@ -72,14 +72,14 @@ class ViEReceiver : public RtpData { int ReceivedRTPPacket(const void* rtp_packet, int rtp_packet_length, const PacketTime& packet_time); int ReceivedRTCPPacket(const void* rtcp_packet, int rtcp_packet_length); - virtual bool OnRecoveredPacket(const uint8_t* packet, - int packet_length) OVERRIDE; // Implements RtpData. virtual int32_t OnReceivedPayloadData( const uint8_t* payload_data, const uint16_t payload_size, - const WebRtcRTPHeader* rtp_header); + const WebRtcRTPHeader* rtp_header) OVERRIDE; + virtual bool OnRecoveredPacket(const uint8_t* packet, + int packet_length) OVERRIDE; void GetReceiveBandwidthEstimatorStats( ReceiveBandwidthEstimatorStats* output) const;