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

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

Issue 2348623003: Unify rtcp packet setters (Closed)
Patch Set: Comments 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
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 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 } 1211 }
1212 } 1212 }
1213 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) || 1213 if ((rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpSr) ||
1214 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) { 1214 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpRr)) {
1215 _rtpRtcp.OnReceivedRtcpReportBlocks(rtcpPacketInformation.report_blocks); 1215 _rtpRtcp.OnReceivedRtcpReportBlocks(rtcpPacketInformation.report_blocks);
1216 } 1216 }
1217 1217
1218 if (_cbTransportFeedbackObserver && 1218 if (_cbTransportFeedbackObserver &&
1219 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpTransportFeedback)) { 1219 (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpTransportFeedback)) {
1220 uint32_t media_source_ssrc = 1220 uint32_t media_source_ssrc =
1221 rtcpPacketInformation.transport_feedback_->GetMediaSourceSsrc(); 1221 rtcpPacketInformation.transport_feedback_->media_ssrc();
1222 if (media_source_ssrc == local_ssrc || 1222 if (media_source_ssrc == local_ssrc ||
1223 registered_ssrcs.find(media_source_ssrc) != registered_ssrcs.end()) { 1223 registered_ssrcs.find(media_source_ssrc) != registered_ssrcs.end()) {
1224 _cbTransportFeedbackObserver->OnTransportFeedback( 1224 _cbTransportFeedbackObserver->OnTransportFeedback(
1225 *rtcpPacketInformation.transport_feedback_.get()); 1225 *rtcpPacketInformation.transport_feedback_.get());
1226 } 1226 }
1227 } 1227 }
1228 } 1228 }
1229 1229
1230 if (!receiver_only_) { 1230 if (!receiver_only_) {
1231 rtc::CritScope cs(&_criticalSectionFeedbacks); 1231 rtc::CritScope cs(&_criticalSectionFeedbacks);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 for (const auto& kv : _receivedInfoMap) { 1268 for (const auto& kv : _receivedInfoMap) {
1269 RTCPReceiveInformation* receive_info = kv.second; 1269 RTCPReceiveInformation* receive_info = kv.second;
1270 RTC_DCHECK(receive_info); 1270 RTC_DCHECK(receive_info);
1271 receive_info->GetTmmbrSet(now_ms, &candidates); 1271 receive_info->GetTmmbrSet(now_ms, &candidates);
1272 } 1272 }
1273 return candidates; 1273 return candidates;
1274 } 1274 }
1275 1275
1276 } // namespace webrtc 1276 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698