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

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

Issue 2007743003: Add sender controlled playout delay limits (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@cleanup_rtp_hdr_extensions
Patch Set: Rename OnReceivedRtcpReport to OnReceivedRtcpReportBlocks Created 4 years, 6 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 21 matching lines...) Expand all
32 if (extension == RtpExtension::kTimestampOffsetUri) 32 if (extension == RtpExtension::kTimestampOffsetUri)
33 return kRtpExtensionTransmissionTimeOffset; 33 return kRtpExtensionTransmissionTimeOffset;
34 if (extension == RtpExtension::kAudioLevelUri) 34 if (extension == RtpExtension::kAudioLevelUri)
35 return kRtpExtensionAudioLevel; 35 return kRtpExtensionAudioLevel;
36 if (extension == RtpExtension::kAbsSendTimeUri) 36 if (extension == RtpExtension::kAbsSendTimeUri)
37 return kRtpExtensionAbsoluteSendTime; 37 return kRtpExtensionAbsoluteSendTime;
38 if (extension == RtpExtension::kVideoRotationUri) 38 if (extension == RtpExtension::kVideoRotationUri)
39 return kRtpExtensionVideoRotation; 39 return kRtpExtensionVideoRotation;
40 if (extension == RtpExtension::kTransportSequenceNumberUri) 40 if (extension == RtpExtension::kTransportSequenceNumberUri)
41 return kRtpExtensionTransportSequenceNumber; 41 return kRtpExtensionTransportSequenceNumber;
42 if (extension == RtpExtension::kPlayoutDelayUri)
43 return kRtpExtensionPlayoutDelay;
42 RTC_NOTREACHED() << "Looking up unsupported RTP extension."; 44 RTC_NOTREACHED() << "Looking up unsupported RTP extension.";
43 return kRtpExtensionNone; 45 return kRtpExtensionNone;
44 } 46 }
45 47
46 RtpRtcp::Configuration::Configuration() 48 RtpRtcp::Configuration::Configuration()
47 : audio(false), 49 : audio(false),
48 receiver_only(false), 50 receiver_only(false),
49 clock(nullptr), 51 clock(nullptr),
50 receive_statistics(NullObjectReceiveStatistics()), 52 receive_statistics(NullObjectReceiveStatistics()),
51 outgoing_transport(nullptr), 53 outgoing_transport(nullptr),
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 return; 919 return;
918 } 920 }
919 // Use RTT from RtcpRttStats class if provided. 921 // Use RTT from RtcpRttStats class if provided.
920 int64_t rtt = rtt_ms(); 922 int64_t rtt = rtt_ms();
921 if (rtt == 0) { 923 if (rtt == 0) {
922 rtcp_receiver_.RTT(rtcp_receiver_.RemoteSSRC(), NULL, &rtt, NULL, NULL); 924 rtcp_receiver_.RTT(rtcp_receiver_.RemoteSSRC(), NULL, &rtt, NULL, NULL);
923 } 925 }
924 rtp_sender_.OnReceivedNACK(nack_sequence_numbers, rtt); 926 rtp_sender_.OnReceivedNACK(nack_sequence_numbers, rtt);
925 } 927 }
926 928
929 void ModuleRtpRtcpImpl::OnReceivedRtcpReportBlocks(
930 const ReportBlockList& report_blocks) {
931 rtp_sender_.OnReceivedRtcpReportBlocks(report_blocks);
932 }
933
927 bool ModuleRtpRtcpImpl::LastReceivedNTP( 934 bool ModuleRtpRtcpImpl::LastReceivedNTP(
928 uint32_t* rtcp_arrival_time_secs, // When we got the last report. 935 uint32_t* rtcp_arrival_time_secs, // When we got the last report.
929 uint32_t* rtcp_arrival_time_frac, 936 uint32_t* rtcp_arrival_time_frac,
930 uint32_t* remote_sr) const { 937 uint32_t* remote_sr) const {
931 // Remote SR: NTP inside the last received (mid 16 bits from sec and frac). 938 // Remote SR: NTP inside the last received (mid 16 bits from sec and frac).
932 uint32_t ntp_secs = 0; 939 uint32_t ntp_secs = 0;
933 uint32_t ntp_frac = 0; 940 uint32_t ntp_frac = 0;
934 941
935 if (!rtcp_receiver_.NTP(&ntp_secs, 942 if (!rtcp_receiver_.NTP(&ntp_secs,
936 &ntp_frac, 943 &ntp_frac,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 996 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
990 StreamDataCountersCallback* callback) { 997 StreamDataCountersCallback* callback) {
991 rtp_sender_.RegisterRtpStatisticsCallback(callback); 998 rtp_sender_.RegisterRtpStatisticsCallback(callback);
992 } 999 }
993 1000
994 StreamDataCountersCallback* 1001 StreamDataCountersCallback*
995 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 1002 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
996 return rtp_sender_.GetRtpStatisticsCallback(); 1003 return rtp_sender_.GetRtpStatisticsCallback();
997 } 1004 }
998 } // namespace webrtc 1005 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698