zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move RtcpReportBlocks implementation from ReceiveStatistics to ReceiveStatisticsImpl

Browse Source 
BUG=webrtc:8016

Review-Url: https://codereview.webrtc.org/2997783002
Cr-Commit-Position: refs/heads/master@{#19327}
This commit is contained in:
danilchap
2017-08-11 08:12:54 -07:00
committed by Commit Bot
parent 77920a415b
commit 0bc8423fe5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,10 +89,6 @@ class ReceiveStatistics : public ReceiveStatisticsProvider {
// Called on new RTP stats creation. // Called on new RTP stats creation.
virtual void RegisterRtpStatisticsCallback( virtual void RegisterRtpStatisticsCallback(
StreamDataCountersCallback* callback) = 0; StreamDataCountersCallback* callback) = 0;
// TODO(danilchap): Make pure virtual when all implmentations of the
// ReceiveStatistics interface will implement it.
std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
}; };
} // namespace webrtc } // namespace webrtc

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

@ -494,7 +494,7 @@ void ReceiveStatisticsImpl::DataCountersUpdated(const StreamDataCounters& stats,
} }
} }
std::vector<rtcp::ReportBlock> ReceiveStatistics::RtcpReportBlocks( std::vector<rtcp::ReportBlock> ReceiveStatisticsImpl::RtcpReportBlocks(
size_t max_blocks) { size_t max_blocks) {
StatisticianMap statisticians = GetActiveStatisticians(); StatisticianMap statisticians = GetActiveStatisticians();
std::vector<rtcp::ReportBlock> result; std::vector<rtcp::ReportBlock> result;

4
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
View File

@ -15,6 +15,7 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <vector>
#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/rtc_base/rate_statistics.h" #include "webrtc/rtc_base/rate_statistics.h"
@ -97,6 +98,9 @@ class ReceiveStatisticsImpl : public ReceiveStatistics,
~ReceiveStatisticsImpl(); ~ReceiveStatisticsImpl();
// Implement ReceiveStatisticsProvider.
std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
// Implement ReceiveStatistics. // Implement ReceiveStatistics.
void IncomingPacket(const RTPHeader& header, void IncomingPacket(const RTPHeader& header,
size_t packet_length, size_t packet_length,