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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.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: Addressed nits and rebase 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 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after
1349 } 1349 }
1350 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) || 1350 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) ||
1351 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) { 1351 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) {
1352 int64_t now = _clock->TimeInMilliseconds(); 1352 int64_t now = _clock->TimeInMilliseconds();
1353 _cbRtcpBandwidthObserver->OnReceivedRtcpReceiverReport( 1353 _cbRtcpBandwidthObserver->OnReceivedRtcpReceiverReport(
1354 rtcpPacketInformation.report_blocks, 1354 rtcpPacketInformation.report_blocks,
1355 rtcpPacketInformation.rtt, 1355 rtcpPacketInformation.rtt,
1356 now); 1356 now);
1357 } 1357 }
1358 } 1358 }
1359 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) ||
1360 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) {
1361 _rtpRtcp.OnReceivedRtcpReceiverReport(
stefan-webrtc 2016/06/06 14:08:15 This sounds a bit wrong to me. Should it be OnRece
Irfan 2016/06/06 15:39:41 The current implementation seems to indicate the S
stefan-webrtc 2016/06/06 20:02:25 Ack, I'd prefer OnReceivedReportBlocks, especially
1362 rtcpPacketInformation.report_blocks);
1363 }
1364
1359 if (_cbTransportFeedbackObserver && 1365 if (_cbTransportFeedbackObserver &&
1360 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpTransportFeedback)) { 1366 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpTransportFeedback)) {
1361 uint32_t media_source_ssrc = 1367 uint32_t media_source_ssrc =
1362 rtcpPacketInformation.transport_feedback_->GetMediaSourceSsrc(); 1368 rtcpPacketInformation.transport_feedback_->GetMediaSourceSsrc();
1363 if (media_source_ssrc == local_ssrc || 1369 if (media_source_ssrc == local_ssrc ||
1364 registered_ssrcs.find(media_source_ssrc) != registered_ssrcs.end()) { 1370 registered_ssrcs.find(media_source_ssrc) != registered_ssrcs.end()) {
1365 _cbTransportFeedbackObserver->OnTransportFeedback( 1371 _cbTransportFeedbackObserver->OnTransportFeedback(
1366 *rtcpPacketInformation.transport_feedback_.get()); 1372 *rtcpPacketInformation.transport_feedback_.get());
1367 } 1373 }
1368 } 1374 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 return -1; 1441 return -1;
1436 } 1442 }
1437 num += receiveInfo->TmmbrSet.lengthOfSet(); 1443 num += receiveInfo->TmmbrSet.lengthOfSet();
1438 receiveInfoIt++; 1444 receiveInfoIt++;
1439 } 1445 }
1440 } 1446 }
1441 return num; 1447 return num;
1442 } 1448 }
1443 1449
1444 } // namespace webrtc 1450 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698