admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove NullReceiveStatistics

Browse Source 
rtcp_sender accepts nullptr as indication statistics shouldn't be used,
Other uses of NullReceiveStatistcs were already deleted.

BUG=webrtc:8016

Review-Url: https://codereview.webrtc.org/2988143002
Cr-Commit-Position: refs/heads/master@{#19197}
This commit is contained in:
danilchap 2017-08-01 03:21:37 -07:00 committed by Commit Bot
parent d339dbc7d4
commit 8a1d2a315f
3 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/modules/rtp_rtcp/include/receive_statistics.h
View File

@ -95,21 +95,5 @@ class ReceiveStatistics : public ReceiveStatisticsProvider {
std::vector<rtcp::ReportBlock> 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_

25
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
View File

@ -525,29 +525,4 @@ std::vector<rtcp::ReportBlock> 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

3
webrtc/video/video_send_stream_tests.cc
View File

@ -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);