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

webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.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/sdes.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 {
 // Source Description (SDES) (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
 //        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 // header |V=2|P|    SC   |  PT=SDES=202  |             length            |
 //        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
@@ skipping 25 matching lines @@
   size_t chunk_payload_size = 4 + 1 + 1 + chunk.cname.size();
   size_t padding_size = 4 - (chunk_payload_size % 4);  // Minimum 1.
   return chunk_payload_size + padding_size;
 }
 }  // namespace
 
 Sdes::Sdes() : block_length_(RtcpPacket::kHeaderLength) {}
 
 Sdes::~Sdes() {}
 
-bool Sdes::Parse(const RtcpCommonHeader& header, const uint8_t* payload) {
-  RTC_CHECK(header.packet_type == kPacketType);
+bool Sdes::Parse(const CommonHeader& packet) {
+  RTC_DCHECK(packet.type() == kPacketType);
 
-  uint8_t number_of_chunks = header.count_or_format;
+  uint8_t number_of_chunks = packet.count();
   std::vector<Chunk> chunks;  // Read chunk into temporary array, so that in
                               // case of an error original array would stay
                               // unchanged.
   size_t block_length = kHeaderLength;
 
-  if (header.payload_size_bytes % 4 != 0) {
-    LOG(LS_WARNING) << "Invalid payload size " << header.payload_size_bytes
+  if (packet.payload_size_bytes() % 4 != 0) {
+    LOG(LS_WARNING) << "Invalid payload size " << packet.payload_size_bytes()
                     << " bytes for a valid Sdes packet. Size should be"
                        " multiple of 4 bytes";
   }
-  const uint8_t* const payload_end = payload + header.payload_size_bytes;
-  const uint8_t* looking_at = payload;
+  const uint8_t* const payload_end =
+      packet.payload() + packet.payload_size_bytes();
+  const uint8_t* looking_at = packet.payload();
   chunks.resize(number_of_chunks);
   for (size_t i = 0; i < number_of_chunks;) {
     // Each chunk consumes at least 8 bytes.
     if (payload_end - looking_at < 8) {
       LOG(LS_WARNING) << "Not enough space left for chunk #" << (i + 1);
       return false;
     }
     chunks[i].ssrc = ByteReader<uint32_t>::ReadBigEndian(looking_at);
     looking_at += sizeof(uint32_t);
     bool cname_found = false;
@@ skipping 88 matching lines @@
     const int kPadding = 0;
     memset(packet + *index, kPadding, padding_size);
     *index += padding_size;
   }
 
   RTC_CHECK_EQ(*index, index_end);
   return true;
 }
 }  // namespace rtcp
 }  // namespace webrtc