[rtp_rtcp] rtcp::Rpsi moved into own file

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::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::RTCPPacketAPP;
-using webrtc::RTCPUtility::RTCPPacketPSFBRPSI;
 using webrtc::RTCPUtility::RTCPPacketReportBlockItem;
 using webrtc::RTCPUtility::RTCPPacketRTPFBNACK;
 using webrtc::RTCPUtility::RTCPPacketRTPFBNACKItem;
 using webrtc::RTCPUtility::RTCPPacketSR;
 
 namespace webrtc {
 namespace rtcp {
 namespace {
 void AssignUWord8(uint8_t* buffer, size_t* offset, uint8_t value) {
   buffer[(*offset)++] = value;
@@ skipping 97 matching lines @@
        it != chunks.end(); ++it) {
     AssignUWord32(buffer, pos, (*it).ssrc);
     AssignUWord8(buffer, pos, kSdesItemType);
     AssignUWord8(buffer, pos, (*it).name.length());
     memcpy(buffer + *pos, (*it).name.data(), (*it).name.length());
     *pos += (*it).name.length();
     memset(buffer + *pos, 0, (*it).null_octets);
     *pos += (*it).null_octets;
   }
 }
-
-// Reference picture selection indication (RPSI) (RFC 4585).
-//
-// FCI:
-//
-//    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
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |      PB       |0| Payload Type|    Native RPSI bit string     |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |   defined per codec          ...                | Padding (0) |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-void CreateRpsi(const RTCPPacketPSFBRPSI& rpsi,
-                uint8_t padding_bytes,
-                uint8_t* buffer,
-                size_t* pos) {
-  // Native bit string should be a multiple of 8 bits.
-  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;
-}
 }  // 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 145 matching lines @@
   // Header (4 bytes).
   // Chunk:
   // SSRC/CSRC (4 bytes) | CNAME (1 byte) | length (1 byte) | name | padding.
   size_t length = kHeaderLength;
   for (const Chunk& chunk : chunks_)
     length += 6 + chunk.name.length() + chunk.null_octets;
   assert(length % 4 == 0);
   return length;
 }
 
-bool Rpsi::Create(uint8_t* packet,
-                  size_t* index,
-                  size_t max_length,
-                  RtcpPacket::PacketReadyCallback* callback) const {
-  assert(rpsi_.NumberOfValidBits > 0);
-  while (*index + BlockLength() > max_length) {
-    if (!OnBufferFull(packet, index, callback))
-      return false;
-  }
-  const uint8_t kFmt = 3;
-  CreateHeader(kFmt, PT_PSFB, HeaderLength(), packet, index);
-  CreateRpsi(rpsi_, padding_bytes_, packet, index);
-  return true;
-}
-
-void Rpsi::WithPictureId(uint64_t picture_id) {
-  const uint32_t kPidBits = 7;
-  const uint64_t k7MsbZeroMask = 0x1ffffffffffffffULL;
-  uint8_t required_bytes = 0;
-  uint64_t shifted_pid = picture_id;
-  do {
-    ++required_bytes;
-    shifted_pid = (shifted_pid >> kPidBits) & k7MsbZeroMask;
-  } while (shifted_pid > 0);
-
-  // Convert picture id to native bit string (natively defined by the video
-  // codec).
-  int pos = 0;
-  for (int i = required_bytes - 1; i > 0; i--) {
-    rpsi_.NativeBitString[pos++] =
-        0x80 | static_cast<uint8_t>(picture_id >> (i * kPidBits));
-  }
-  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;
-  }
-}
-
 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