[rtp_rtcp] rtcp::Fir 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.
  */
 
@@ skipping 11 matching lines @@
 
 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::RTCPPacketPSFBFIR;
-using webrtc::RTCPUtility::RTCPPacketPSFBFIRItem;
 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 {
-// Unused SSRC of media source, set to 0.
-const uint32_t kUnusedMediaSourceSsrc0 = 0;
-
 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;
 }
-void AssignUWord24(uint8_t* buffer, size_t* offset, uint32_t value) {
-  ByteWriter<uint32_t, 3>::WriteBigEndian(buffer + *offset, value);
-  *offset += 3;
-}
 void AssignUWord32(uint8_t* buffer, size_t* offset, uint32_t value) {
   ByteWriter<uint32_t>::WriteBigEndian(buffer + *offset, value);
   *offset += 4;
 }
 
 //  Sender report (SR) (RFC 3550).
 //   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|    RC   |   PT=SR=200   |             length            |
@@ skipping 111 matching lines @@
   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;
 }
 
-// Full intra request (FIR) (RFC 5104).
-//
-// 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
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                              SSRC                             |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   | Seq nr.       |    Reserved                                   |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-void CreateFir(const RTCPPacketPSFBFIR& fir,
-               const RTCPPacketPSFBFIRItem& fir_item,
-               uint8_t* buffer,
-               size_t* pos) {
-  AssignUWord32(buffer, pos, fir.SenderSSRC);
-  AssignUWord32(buffer, pos, kUnusedMediaSourceSsrc0);
-  AssignUWord32(buffer, pos, fir_item.SSRC);
-  AssignUWord8(buffer, pos, fir_item.CommandSequenceNumber);
-  AssignUWord24(buffer, pos, 0);
-}
-
 // 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                             |
@@ skipping 207 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 Fir::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;
-  }
-  const uint8_t kFmt = 4;
-  CreateHeader(kFmt, PT_PSFB, HeaderLength(), packet, index);
-  CreateFir(fir_, fir_item_, packet, index);
-  return true;
-}
-
 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);
@@ skipping 77 matching lines @@
   return length_;
 }
 
 void RawPacket::SetLength(size_t length) {
   assert(length <= buffer_length_);
   length_ = length;
 }
 
 }  // namespace rtcp
 }  // namespace webrtc