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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

Issue 2378113002: Allow max 1 block per type in RTCP Extended Reports (Closed)
Patch Set: use operator==(T, Optional<T>) for slightly cleaner tests Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 5c80e236db64dc417b03fbe77b301d890ad9cc0b..bdb0c24928b7219634a33e69ff8aca3748fee30d 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -686,13 +686,11 @@ void RTCPReceiver::HandleXr(const CommonHeader& rtcp_block,
return;
}
- for (const rtcp::Rrtr& rrtr : xr.rrtrs())
- HandleXrReceiveReferenceTime(xr.sender_ssrc(), rrtr);
+ if (xr.rrtr())
+ HandleXrReceiveReferenceTime(xr.sender_ssrc(), *xr.rrtr());
- for (const rtcp::Dlrr& dlrr : xr.dlrrs()) {
- for (const rtcp::ReceiveTimeInfo& time_info : dlrr.sub_blocks())
- HandleXrDlrrReportBlock(time_info);
- }
+ for (const rtcp::ReceiveTimeInfo& time_info : xr.dlrr().sub_blocks())
+ HandleXrDlrrReportBlock(time_info);
}
void RTCPReceiver::HandleXrReceiveReferenceTime(

Powered by Google App Engine
This is Rietveld 408576698