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

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

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 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 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 << rtcpPacketInformation.nackSequenceNumbers.size(); 1332 << rtcpPacketInformation.nackSequenceNumbers.size();
1333 _rtpRtcp.OnReceivedNACK(rtcpPacketInformation.nackSequenceNumbers); 1333 _rtpRtcp.OnReceivedNACK(rtcpPacketInformation.nackSequenceNumbers);
1334 } 1334 }
1335 } 1335 }
1336 { 1336 {
1337 // We need feedback that we have received a report block(s) so that we 1337 // We need feedback that we have received a report block(s) so that we
1338 // can generate a new packet in a conference relay scenario, one received 1338 // can generate a new packet in a conference relay scenario, one received
1339 // report can generate several RTCP packets, based on number relayed/mixed 1339 // report can generate several RTCP packets, based on number relayed/mixed
1340 // a send report block should go out to all receivers. 1340 // a send report block should go out to all receivers.
1341 if (_cbRtcpIntraFrameObserver) { 1341 if (_cbRtcpIntraFrameObserver) {
1342 DCHECK(!receiver_only_); 1342 RTC_DCHECK(!receiver_only_);
1343 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) || 1343 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) ||
1344 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpFir)) { 1344 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpFir)) {
1345 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) { 1345 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) {
1346 LOG(LS_VERBOSE) << "Incoming PLI from SSRC " 1346 LOG(LS_VERBOSE) << "Incoming PLI from SSRC "
1347 << rtcpPacketInformation.remoteSSRC; 1347 << rtcpPacketInformation.remoteSSRC;
1348 } else { 1348 } else {
1349 LOG(LS_VERBOSE) << "Incoming FIR from SSRC " 1349 LOG(LS_VERBOSE) << "Incoming FIR from SSRC "
1350 << rtcpPacketInformation.remoteSSRC; 1350 << rtcpPacketInformation.remoteSSRC;
1351 } 1351 }
1352 _cbRtcpIntraFrameObserver->OnReceivedIntraFrameRequest(local_ssrc); 1352 _cbRtcpIntraFrameObserver->OnReceivedIntraFrameRequest(local_ssrc);
1353 } 1353 }
1354 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSli) { 1354 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSli) {
1355 _cbRtcpIntraFrameObserver->OnReceivedSLI( 1355 _cbRtcpIntraFrameObserver->OnReceivedSLI(
1356 local_ssrc, rtcpPacketInformation.sliPictureId); 1356 local_ssrc, rtcpPacketInformation.sliPictureId);
1357 } 1357 }
1358 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRpsi) { 1358 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRpsi) {
1359 _cbRtcpIntraFrameObserver->OnReceivedRPSI( 1359 _cbRtcpIntraFrameObserver->OnReceivedRPSI(
1360 local_ssrc, rtcpPacketInformation.rpsiPictureId); 1360 local_ssrc, rtcpPacketInformation.rpsiPictureId);
1361 } 1361 }
1362 } 1362 }
1363 if (_cbRtcpBandwidthObserver) { 1363 if (_cbRtcpBandwidthObserver) {
1364 DCHECK(!receiver_only_); 1364 RTC_DCHECK(!receiver_only_);
1365 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRemb) { 1365 if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRemb) {
1366 LOG(LS_VERBOSE) << "Incoming REMB: " 1366 LOG(LS_VERBOSE) << "Incoming REMB: "
1367 << rtcpPacketInformation.receiverEstimatedMaxBitrate; 1367 << rtcpPacketInformation.receiverEstimatedMaxBitrate;
1368 _cbRtcpBandwidthObserver->OnReceivedEstimatedBitrate( 1368 _cbRtcpBandwidthObserver->OnReceivedEstimatedBitrate(
1369 rtcpPacketInformation.receiverEstimatedMaxBitrate); 1369 rtcpPacketInformation.receiverEstimatedMaxBitrate);
1370 } 1370 }
1371 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) || 1371 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) ||
1372 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) { 1372 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) {
1373 int64_t now = _clock->TimeInMilliseconds(); 1373 int64_t now = _clock->TimeInMilliseconds();
1374 _cbRtcpBandwidthObserver->OnReceivedRtcpReceiverReport( 1374 _cbRtcpBandwidthObserver->OnReceivedRtcpReceiverReport(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 return -1; 1446 return -1;
1447 } 1447 }
1448 num += receiveInfo->TmmbrSet.lengthOfSet(); 1448 num += receiveInfo->TmmbrSet.lengthOfSet();
1449 receiveInfoIt++; 1449 receiveInfoIt++;
1450 } 1450 }
1451 } 1451 }
1452 return num; 1452 return num;
1453 } 1453 }
1454 1454
1455 } // namespace webrtc 1455 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698