Allow max 1 block per type in RTCP Extended Reports

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 683 matching lines @@
 
 std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildReceiverReferenceTime(
     const RtcpContext& ctx) {
 
   rtcp::ExtendedReports* xr = new rtcp::ExtendedReports();
   xr->SetSenderSsrc(ssrc_);
 
   rtcp::Rrtr rrtr;
   rrtr.SetNtp(NtpTime(ctx.ntp_sec_, ctx.ntp_frac_));
 
-  xr->AddRrtr(rrtr);
+  xr->SetRrtr(rrtr);
 
   // TODO(sprang): Merge XR report sending to contain all of RRTR, DLRR, VOIP?
 
   return std::unique_ptr<rtcp::RtcpPacket>(xr);
 }
 
 std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildDlrr(
     const RtcpContext& ctx) {
   rtcp::ExtendedReports* xr = new rtcp::ExtendedReports();
   xr->SetSenderSsrc(ssrc_);
-
-  rtcp::Dlrr dlrr;
   RTC_DCHECK(ctx.feedback_state_.has_last_xr_rr);
-  dlrr.AddDlrrItem(ctx.feedback_state_.last_xr_rr);
-
-  xr->AddDlrr(dlrr);
+  xr->AddDlrrItem(ctx.feedback_state_.last_xr_rr);
 
   return std::unique_ptr<rtcp::RtcpPacket>(xr);
 }
 
-// TODO(sprang): Add a unit test for this, or remove if the code isn't used.
 std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildVoIPMetric(
     const RtcpContext& context) {
   rtcp::ExtendedReports* xr = new rtcp::ExtendedReports();
   xr->SetSenderSsrc(ssrc_);
 
   rtcp::VoipMetric voip;
   voip.SetMediaSsrc(remote_ssrc_);
   voip.SetVoipMetric(xr_voip_metric_);
 
-  xr->AddVoipMetric(voip);
+  xr->SetVoipMetric(voip);
 
   return std::unique_ptr<rtcp::RtcpPacket>(xr);
 }
 
 int32_t RTCPSender::SendRTCP(const FeedbackState& feedback_state,
                              RTCPPacketType packetType,
                              int32_t nack_size,
                              const uint16_t* nack_list,
                              bool repeat,
                              uint64_t pictureID) {
@@ skipping 296 matching lines @@
     // but we can't because of an incorrect warning (C4822) in MVS 2013.
   } sender(transport_, event_log_);
 
   RTC_DCHECK_LE(max_payload_length_, static_cast<size_t>(IP_PACKET_SIZE));
   uint8_t buffer[IP_PACKET_SIZE];
   return packet.BuildExternalBuffer(buffer, max_payload_length_, &sender) &&
          !sender.send_failure_;
 }
 
 }  // namespace webrtc