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

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

Issue 2276833003: Change RtpSender::OnReceiveNACK name and signature (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: -one more <list> include Created 4 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
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 } 1256 }
1257 if (!receiver_only_ && 1257 if (!receiver_only_ &&
1258 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSrReq)) { 1258 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSrReq)) {
1259 _rtpRtcp.OnRequestSendReport(); 1259 _rtpRtcp.OnRequestSendReport();
1260 } 1260 }
1261 if (!receiver_only_ && 1261 if (!receiver_only_ &&
1262 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpNack)) { 1262 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpNack)) {
1263 if (rtcpPacketInformation.nackSequenceNumbers.size() > 0) { 1263 if (rtcpPacketInformation.nackSequenceNumbers.size() > 0) {
1264 LOG(LS_VERBOSE) << "Incoming NACK length: " 1264 LOG(LS_VERBOSE) << "Incoming NACK length: "
1265 << rtcpPacketInformation.nackSequenceNumbers.size(); 1265 << rtcpPacketInformation.nackSequenceNumbers.size();
1266 _rtpRtcp.OnReceivedNACK(rtcpPacketInformation.nackSequenceNumbers); 1266 _rtpRtcp.OnReceivedNack(rtcpPacketInformation.nackSequenceNumbers);
1267 } 1267 }
1268 } 1268 }
1269 { 1269 {
1270 // We need feedback that we have received a report block(s) so that we 1270 // We need feedback that we have received a report block(s) so that we
1271 // can generate a new packet in a conference relay scenario, one received 1271 // can generate a new packet in a conference relay scenario, one received
1272 // report can generate several RTCP packets, based on number relayed/mixed 1272 // report can generate several RTCP packets, based on number relayed/mixed
1273 // a send report block should go out to all receivers. 1273 // a send report block should go out to all receivers.
1274 if (_cbRtcpIntraFrameObserver) { 1274 if (_cbRtcpIntraFrameObserver) {
1275 RTC_DCHECK(!receiver_only_); 1275 RTC_DCHECK(!receiver_only_);
1276 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) || 1276 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpPli) ||
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 1366
1367 for (const auto& kv : _receivedInfoMap) { 1367 for (const auto& kv : _receivedInfoMap) {
1368 RTCPReceiveInformation* receive_info = kv.second; 1368 RTCPReceiveInformation* receive_info = kv.second;
1369 RTC_DCHECK(receive_info); 1369 RTC_DCHECK(receive_info);
1370 receive_info->GetTmmbrSet(now_ms, &candidates); 1370 receive_info->GetTmmbrSet(now_ms, &candidates);
1371 } 1371 }
1372 return candidates; 1372 return candidates;
1373 } 1373 }
1374 1374
1375 } // namespace webrtc 1375 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698