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

Remove NullObjectReceiveStatistics() in rtp_rtcp module

Browse Source 
use (already supported) nullptr as indication for no statistics

BUG=webrtc:8016

Review-Url: https://codereview.webrtc.org/2983363002
Cr-Commit-Position: refs/heads/master@{#19129}
This commit is contained in:
danilchap 2017-07-25 04:20:12 -07:00 committed by Commit Bot
parent a04d9c31a0
commit d3f3c3497b
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -55,7 +55,7 @@ class RtpRtcp : public Module {
// The clock to use to read time. If nullptr then system clock will be used.
Clock* clock = nullptr;
ReceiveStatistics* receive_statistics;
ReceiveStatistics* receive_statistics = nullptr;
// Transport object that will be called when packets are ready to be sent
// out on the network.

3
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -54,8 +54,7 @@ RTPExtensionType StringToRtpExtensionType(const std::string& extension) {
return kRtpExtensionNone;
}
RtpRtcp::Configuration::Configuration()
: receive_statistics(NullObjectReceiveStatistics()) {}
RtpRtcp::Configuration::Configuration() = default;
RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
if (configuration.clock) {

5
webrtc/modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -22,11 +22,6 @@ RtpFeedback* NullObjectRtpFeedback() {
return &null_rtp_feedback;
}
ReceiveStatistics* NullObjectReceiveStatistics() {
static NullReceiveStatistics null_receive_statistics;
return &null_receive_statistics;
}
namespace RtpUtility {
enum {

1
webrtc/modules/rtp_rtcp/source/rtp_utility.h
View File

@ -25,7 +25,6 @@ namespace webrtc {
const uint8_t kRtpMarkerBitMask = 0x80;
RtpFeedback* NullObjectRtpFeedback();
ReceiveStatistics* NullObjectReceiveStatistics();
namespace RtpUtility {