[rtcp] Tmmbn/Tmmbr Parse updated not to use RTCPUtility

webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.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/tmmbr.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 Tmmbr::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                        |
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //  |             SSRC of media source (unused) = 0                 |
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //  :            Feedback Control Information (FCI)                 :
 //  :                                                               :
 // Temporary Maximum Media Stream Bit Rate Request (TMMBR) (RFC 5104).
 // The Feedback Control Information (FCI) for the TMMBR
 // consists of one or more FCI entries.
 // 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                             |
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //  | MxTBR Exp |  MxTBR Mantissa                 |Measured Overhead|
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool Tmmbr::Parse(const RtcpCommonHeader& header, const uint8_t* payload) {
-  RTC_CHECK(header.packet_type == kPacketType);
-  RTC_CHECK(header.count_or_format == kFeedbackMessageType);
+bool Tmmbr::Parse(const CommonHeader& packet) {
+  RTC_DCHECK_EQ(packet.type(), kPacketType);
+  RTC_DCHECK_EQ(packet.fmt(), kFeedbackMessageType);
 
-  if (header.payload_size_bytes < kCommonFeedbackLength + TmmbItem::kLength) {
-    LOG(LS_WARNING) << "Payload length " << header.payload_size_bytes
+  if (packet.payload_size_bytes() < kCommonFeedbackLength + TmmbItem::kLength) {
+    LOG(LS_WARNING) << "Payload length " << packet.payload_size_bytes()
                     << " is too small for a TMMBR.";
     return false;
   }
-  size_t items_size_bytes = header.payload_size_bytes - kCommonFeedbackLength;
+  size_t items_size_bytes = packet.payload_size_bytes() - kCommonFeedbackLength;
   if (items_size_bytes % TmmbItem::kLength != 0) {
-    LOG(LS_WARNING) << "Payload length " << header.payload_size_bytes
+    LOG(LS_WARNING) << "Payload length " << packet.payload_size_bytes()
                     << " is not valid for a TMMBR.";
     return false;
   }
-  ParseCommonFeedback(payload);
+  ParseCommonFeedback(packet.payload());
 
-  const uint8_t* next_item = payload + kCommonFeedbackLength;
+  const uint8_t* next_item = packet.payload() + kCommonFeedbackLength;
   size_t number_of_items = items_size_bytes / TmmbItem::kLength;
   items_.resize(number_of_items);
   for (TmmbItem& item : items_) {
     if (!item.Parse(next_item))
       return false;
     next_item += TmmbItem::kLength;
   }
   return true;
 }
 
@@ skipping 19 matching lines @@
   *index += kCommonFeedbackLength;
   for (const TmmbItem& item : items_) {
     item.Create(packet + *index);
     *index += TmmbItem::kLength;
   }
   RTC_CHECK_EQ(index_end, *index);
   return true;
 }
 }  // namespace rtcp
 }  // namespace webrtc