Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 2983363002: Remove NullObjectReceiveStatistics() in rtp_rtcp module (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 if (extension == RtpExtension::kPlayoutDelayUri) 47 if (extension == RtpExtension::kPlayoutDelayUri)
48 return kRtpExtensionPlayoutDelay; 48 return kRtpExtensionPlayoutDelay;
49 if (extension == RtpExtension::kVideoContentTypeUri) 49 if (extension == RtpExtension::kVideoContentTypeUri)
50 return kRtpExtensionVideoContentType; 50 return kRtpExtensionVideoContentType;
51 if (extension == RtpExtension::kVideoTimingUri) 51 if (extension == RtpExtension::kVideoTimingUri)
52 return kRtpExtensionVideoTiming; 52 return kRtpExtensionVideoTiming;
53 RTC_NOTREACHED() << "Looking up unsupported RTP extension."; 53 RTC_NOTREACHED() << "Looking up unsupported RTP extension.";
54 return kRtpExtensionNone; 54 return kRtpExtensionNone;
55 } 55 }
56 56
57 RtpRtcp::Configuration::Configuration() 57 RtpRtcp::Configuration::Configuration() = default;
58 : receive_statistics(NullObjectReceiveStatistics()) {}
59 58
60 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { 59 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
61 if (configuration.clock) { 60 if (configuration.clock) {
62 return new ModuleRtpRtcpImpl(configuration); 61 return new ModuleRtpRtcpImpl(configuration);
63 } else { 62 } else {
64 // No clock implementation provided, use default clock. 63 // No clock implementation provided, use default clock.
65 RtpRtcp::Configuration configuration_copy; 64 RtpRtcp::Configuration configuration_copy;
66 memcpy(&configuration_copy, &configuration, 65 memcpy(&configuration_copy, &configuration,
67 sizeof(RtpRtcp::Configuration)); 66 sizeof(RtpRtcp::Configuration));
68 configuration_copy.clock = Clock::GetRealTimeClock(); 67 configuration_copy.clock = Clock::GetRealTimeClock();
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 StreamDataCountersCallback* 920 StreamDataCountersCallback*
922 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 921 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
923 return rtp_sender_->GetRtpStatisticsCallback(); 922 return rtp_sender_->GetRtpStatisticsCallback();
924 } 923 }
925 924
926 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( 925 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation(
927 const BitrateAllocation& bitrate) { 926 const BitrateAllocation& bitrate) {
928 rtcp_sender_.SetVideoBitrateAllocation(bitrate); 927 rtcp_sender_.SetVideoBitrateAllocation(bitrate);
929 } 928 }
930 } // namespace webrtc 929 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_utility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698