[rtcp] Fir/Sli/Rpsi updated not to use RTCPUtility

webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.cc

 /*
  *  Copyright (c) 2016 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/sli.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-
-using webrtc::RTCPUtility::RtcpCommonHeader;
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
 
 namespace webrtc {
 namespace rtcp {
+constexpr uint8_t Sli::kFeedbackMessageType;
 // RFC 4585: Feedback format.
 //
 // Common packet format:
 //
 //   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|   FMT   |       PT      |          length               |
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //  |                  SSRC of packet sender                        |
@@ skipping 20 matching lines @@
 }
 
 void Sli::Macroblocks::Parse(const uint8_t* buffer) {
   item_ = ByteReader<uint32_t>::ReadBigEndian(buffer);
 }
 
 void Sli::Macroblocks::Create(uint8_t* buffer) const {
   ByteWriter<uint32_t>::WriteBigEndian(buffer, item_);
 }
 
-bool Sli::Parse(const RtcpCommonHeader& header, const uint8_t* payload) {
-  RTC_DCHECK(header.packet_type == kPacketType);
-  RTC_DCHECK(header.count_or_format == kFeedbackMessageType);
+bool Sli::Parse(const CommonHeader& packet) {
+  RTC_DCHECK_EQ(packet.type(), kPacketType);
+  RTC_DCHECK_EQ(packet.fmt(), kFeedbackMessageType);
 
-  if (header.payload_size_bytes <
+  if (packet.payload_size_bytes() <
       kCommonFeedbackLength + Macroblocks::kLength) {
     LOG(LS_WARNING) << "Packet is too small to be a valid SLI packet";
     return false;
   }
 
   size_t number_of_items =
-      (header.payload_size_bytes - kCommonFeedbackLength) /
+      (packet.payload_size_bytes() - kCommonFeedbackLength) /
       Macroblocks::kLength;
 
-  ParseCommonFeedback(payload);
+  ParseCommonFeedback(packet.payload());
   items_.resize(number_of_items);
 
-  const uint8_t* next_item = payload + kCommonFeedbackLength;
+  const uint8_t* next_item = packet.payload() + kCommonFeedbackLength;
   for (Macroblocks& item : items_) {
     item.Parse(next_item);
     next_item += Macroblocks::kLength;
   }
 
   return true;
 }
 
 bool Sli::Create(uint8_t* packet,
                  size_t* index,
@@ skipping 10 matching lines @@
   *index += kCommonFeedbackLength;
   for (const Macroblocks& item : items_) {
     item.Create(packet + *index);
     *index += Macroblocks::kLength;
   }
   return true;
 }
 
 }  // namespace rtcp
 }  // namespace webrtc