diff --git a/webrtc/modules/rtp_rtcp/include/receive_statistics.h b/webrtc/modules/rtp_rtcp/include/receive_statistics.h index edbaf8f6f8..d10e933810 100644 --- a/webrtc/modules/rtp_rtcp/include/receive_statistics.h +++ b/webrtc/modules/rtp_rtcp/include/receive_statistics.h @@ -95,21 +95,5 @@ class ReceiveStatistics : public ReceiveStatisticsProvider { std::vector RtcpReportBlocks(size_t max_blocks) override; }; -class NullReceiveStatistics : public ReceiveStatistics { - public: - void IncomingPacket(const RTPHeader& rtp_header, - size_t packet_length, - bool retransmitted) override; - void FecPacketReceived(const RTPHeader& header, - size_t packet_length) override; - StatisticianMap GetActiveStatisticians() const override; - StreamStatistician* GetStatistician(uint32_t ssrc) const override; - void SetMaxReorderingThreshold(int max_reordering_threshold) override; - void RegisterRtcpStatisticsCallback( - RtcpStatisticsCallback* callback) override; - void RegisterRtpStatisticsCallback( - StreamDataCountersCallback* callback) override; -}; - } // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc index 21f5b37c2f..150c88b426 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc @@ -525,29 +525,4 @@ std::vector ReceiveStatistics::RtcpReportBlocks( return result; } -void NullReceiveStatistics::IncomingPacket(const RTPHeader& rtp_header, - size_t packet_length, - bool retransmitted) {} - -void NullReceiveStatistics::FecPacketReceived(const RTPHeader& header, - size_t packet_length) {} - -StatisticianMap NullReceiveStatistics::GetActiveStatisticians() const { - return StatisticianMap(); -} - -StreamStatistician* NullReceiveStatistics::GetStatistician( - uint32_t ssrc) const { - return NULL; -} - -void NullReceiveStatistics::SetMaxReorderingThreshold( - int max_reordering_threshold) {} - -void NullReceiveStatistics::RegisterRtcpStatisticsCallback( - RtcpStatisticsCallback* callback) {} - -void NullReceiveStatistics::RegisterRtpStatisticsCallback( - StreamDataCountersCallback* callback) {} - } // namespace webrtc diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 890413f177..94b57e3527 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -757,8 +757,7 @@ void VideoSendStreamTest::TestNackRetransmission( if (++send_count_ == 3) { uint16_t nack_sequence_number = header.sequenceNumber - 1; nacked_sequence_number_ = nack_sequence_number; - NullReceiveStatistics null_stats; - RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), &null_stats, + RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), nullptr, nullptr, nullptr, transport_adapter_.get()); rtcp_sender.SetRTCPStatus(RtcpMode::kReducedSize);