[rtp_rtcp] rtcp::Xr moved into own file and renamed to ExtendedReports on the way

webrtc/modules/rtp_rtcp/source/rtcp_packet.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
 
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 
-using webrtc::RTCPUtility::kBtDlrr;
-using webrtc::RTCPUtility::kBtReceiverReferenceTime;
-using webrtc::RTCPUtility::kBtVoipMetric;
-
 using webrtc::RTCPUtility::PT_APP;
 using webrtc::RTCPUtility::PT_IJ;
 using webrtc::RTCPUtility::PT_PSFB;
 using webrtc::RTCPUtility::PT_RTPFB;
 using webrtc::RTCPUtility::PT_SDES;
 using webrtc::RTCPUtility::PT_SR;
-using webrtc::RTCPUtility::PT_XR;
 
 using webrtc::RTCPUtility::RTCPPacketAPP;
 using webrtc::RTCPUtility::RTCPPacketPSFBRPSI;
 using webrtc::RTCPUtility::RTCPPacketReportBlockItem;
 using webrtc::RTCPUtility::RTCPPacketRTPFBNACK;
 using webrtc::RTCPUtility::RTCPPacketRTPFBNACKItem;
 using webrtc::RTCPUtility::RTCPPacketSR;
-using webrtc::RTCPUtility::RTCPPacketXRDLRRReportBlockItem;
-using webrtc::RTCPUtility::RTCPPacketXR;
 
 namespace webrtc {
 namespace rtcp {
 namespace {
 void AssignUWord8(uint8_t* buffer, size_t* offset, uint8_t value) {
   buffer[(*offset)++] = value;
 }
 void AssignUWord16(uint8_t* buffer, size_t* offset, uint16_t value) {
   ByteWriter<uint16_t>::WriteBigEndian(buffer + *offset, value);
   *offset += 2;
@@ skipping 121 matching lines @@
   assert(rpsi.NumberOfValidBits % 8 == 0);
   AssignUWord32(buffer, pos, rpsi.SenderSSRC);
   AssignUWord32(buffer, pos, rpsi.MediaSSRC);
   AssignUWord8(buffer, pos, padding_bytes * 8);
   AssignUWord8(buffer, pos, rpsi.PayloadType);
   memcpy(buffer + *pos, rpsi.NativeBitString, rpsi.NumberOfValidBits / 8);
   *pos += rpsi.NumberOfValidBits / 8;
   memset(buffer + *pos, 0, padding_bytes);
   *pos += padding_bytes;
 }
-
-// From RFC 3611: RTP Control Protocol Extended Reports (RTCP XR).
-//
-// Format for XR packets:
-//
-//   0                   1                   2                   3
-//   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |V=2|P|reserved |   PT=XR=207   |             length            |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |                              SSRC                             |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  :                         report blocks                         :
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-void CreateXrHeader(const RTCPPacketXR& header,
-                    uint8_t* buffer,
-                    size_t* pos) {
-  AssignUWord32(buffer, pos, header.OriginatorSSRC);
-}
-
 }  // namespace
 
 void RtcpPacket::Append(RtcpPacket* packet) {
   assert(packet);
   appended_packets_.push_back(packet);
 }
 
 rtc::scoped_ptr<RawPacket> RtcpPacket::Build() const {
   size_t length = 0;
   rtc::scoped_ptr<RawPacket> packet(new RawPacket(IP_PACKET_SIZE));
@@ skipping 187 matching lines @@
   rpsi_.NativeBitString[pos++] = static_cast<uint8_t>(picture_id & 0x7f);
   rpsi_.NumberOfValidBits = pos * 8;
 
   // Calculate padding bytes (to reach next 32-bit boundary, 1, 2 or 3 bytes).
   padding_bytes_ = 4 - ((2 + required_bytes) % 4);
   if (padding_bytes_ == 4) {
     padding_bytes_ = 0;
   }
 }
 
-bool Xr::Create(uint8_t* packet,
-                size_t* index,
-                size_t max_length,
-                RtcpPacket::PacketReadyCallback* callback) const {
-  while (*index + BlockLength() > max_length) {
-    if (!OnBufferFull(packet, index, callback))
-      return false;
-  }
-  CreateHeader(0U, PT_XR, HeaderLength(), packet, index);
-  CreateXrHeader(xr_header_, packet, index);
-  for (const Rrtr& block : rrtr_blocks_) {
-    block.Create(packet + *index);
-    *index += Rrtr::kLength;
-  }
-  for (const Dlrr& block : dlrr_blocks_) {
-    block.Create(packet + *index);
-    *index += block.BlockLength();
-  }
-  for (const VoipMetric& block : voip_metric_blocks_) {
-    block.Create(packet + *index);
-    *index += VoipMetric::kLength;
-  }
-  return true;
-}
-
-bool Xr::WithRrtr(Rrtr* rrtr) {
-  RTC_DCHECK(rrtr);
-  if (rrtr_blocks_.size() >= kMaxNumberOfRrtrBlocks) {
-    LOG(LS_WARNING) << "Max RRTR blocks reached.";
-    return false;
-  }
-  rrtr_blocks_.push_back(*rrtr);
-  return true;
-}
-
-bool Xr::WithDlrr(Dlrr* dlrr) {
-  RTC_DCHECK(dlrr);
-  if (dlrr_blocks_.size() >= kMaxNumberOfDlrrBlocks) {
-    LOG(LS_WARNING) << "Max DLRR blocks reached.";
-    return false;
-  }
-  dlrr_blocks_.push_back(*dlrr);
-  return true;
-}
-
-bool Xr::WithVoipMetric(VoipMetric* voip_metric) {
-  assert(voip_metric);
-  if (voip_metric_blocks_.size() >= kMaxNumberOfVoipMetricBlocks) {
-    LOG(LS_WARNING) << "Max Voip Metric blocks reached.";
-    return false;
-  }
-  voip_metric_blocks_.push_back(*voip_metric);
-  return true;
-}
-
-size_t Xr::DlrrLength() const {
-  size_t length = 0;
-  for (const Dlrr& block : dlrr_blocks_) {
-    length += block.BlockLength();
-  }
-  return length;
-}
-
 RawPacket::RawPacket(size_t buffer_length)
     : buffer_length_(buffer_length), length_(0) {
   buffer_.reset(new uint8_t[buffer_length]);
 }
 
 RawPacket::RawPacket(const uint8_t* packet, size_t packet_length)
     : buffer_length_(packet_length), length_(packet_length) {
   buffer_.reset(new uint8_t[packet_length]);
   memcpy(buffer_.get(), packet, packet_length);
 }
@@ skipping 14 matching lines @@
   return length_;
 }
 
 void RawPacket::SetLength(size_t length) {
   assert(length <= buffer_length_);
   length_ = length;
 }
 
 }  // namespace rtcp
 }  // namespace webrtc