[rtcp] Bye::Parse updated not to use RTCPUtility

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

 /*
  *  Copyright (c) 2015 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/bye.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 {
 
 // Bye packet (BYE) (RFC 3550).
 //
 //        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|    SC   |   PT=BYE=203  |             length            |
 //       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //       |                           SSRC/CSRC                           |
 //       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //       :                              ...                              :
 //       +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
 // (opt) |     length    |               reason for leaving            ...
 //       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 Bye::Bye() : sender_ssrc_(0) {}
 
-bool Bye::Parse(const RtcpCommonHeader& header, const uint8_t* payload) {
-  RTC_DCHECK(header.packet_type == kPacketType);
+bool Bye::Parse(const CommonHeader& packet) {
+  RTC_DCHECK(packet.type() == kPacketType);
 
-  const uint8_t src_count = header.count_or_format;
+  const uint8_t src_count = packet.count();
   // Validate packet.
-  if (header.payload_size_bytes < 4u * src_count) {
+  if (packet.payload_size_bytes() < 4u * src_count) {
     LOG(LS_WARNING)
         << "Packet is too small to contain CSRCs it promise to have.";
     return false;
   }
-  bool has_reason = (header.payload_size_bytes > 4u * src_count);
+  const uint8_t* const payload = packet.payload();
+  bool has_reason = packet.payload_size_bytes() > 4u * src_count;
   uint8_t reason_length = 0;
   if (has_reason) {
     reason_length = payload[4u * src_count];
-    if (header.payload_size_bytes - 4u * src_count < 1u + reason_length) {
+    if (packet.payload_size_bytes() - 4u * src_count < 1u + reason_length) {
       LOG(LS_WARNING) << "Invalid reason length: " << reason_length;
       return false;
     }
   }
   // Once sure packet is valid, copy values.
   if (src_count == 0) {  // A count value of zero is valid, but useless.
     sender_ssrc_ = 0;
     csrcs_.clear();
   } else {
     sender_ssrc_ = ByteReader<uint32_t>::ReadBigEndian(payload);
@@ skipping 63 matching lines @@
 }
 
 size_t Bye::BlockLength() const {
   size_t src_count = (1 + csrcs_.size());
   size_t reason_size_in_32bits = reason_.empty() ? 0 : (reason_.size() / 4 + 1);
   return kHeaderLength + 4 * (src_count + reason_size_in_32bits);
 }
 
 }  // namespace rtcp
 }  // namespace webrtc