Add a ParseHeader method to RtcpPacket, for parsing common RTCP header.

webrtc/modules/rtp_rtcp/source/rtcp_utility.h

 /*
 *  Copyright (c) 2012 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 288 matching lines @@
 struct RTCPRawPacket {
   const uint8_t* _ptrPacketBegin;
   const uint8_t* _ptrPacketEnd;
 };
 
 struct RTCPModRawPacket {
   uint8_t* _ptrPacketBegin;
   uint8_t* _ptrPacketEnd;
 };
 
-struct RTCPCommonHeader {
-  uint8_t V;   // Version
-  bool P;      // Padding
-  uint8_t IC;  // Item count/subtype
-  uint8_t PT;  // Packet Type
-  uint16_t LengthInOctets;
+struct RtcpCommonHeader {
+  static const uint8_t kHeaderSizeBytes = 4;
+  RtcpCommonHeader()
+      : version(2),
+        count_or_format(0),
+        packet_type(0),
+        payload_size_bytes(0),
+        padding_bytes(0) {}
+
+  uint32_t BlockSize() const {
+    return kHeaderSizeBytes + payload_size_bytes + padding_bytes;
+  }
+
+  uint8_t version;
+  uint8_t count_or_format;
+  uint8_t packet_type;
+  uint32_t payload_size_bytes;
+  uint8_t padding_bytes;
 };
 
 enum RTCPPT : uint8_t {
   PT_IJ = 195,
   PT_SR = 200,
   PT_RR = 201,
   PT_SDES = 202,
   PT_BYE = 203,
   PT_APP = 204,
   PT_RTPFB = 205,
   PT_PSFB = 206,
   PT_XR = 207
 };
 
 // Extended report blocks, RFC 3611.
 enum RtcpXrBlockType : uint8_t {
   kBtReceiverReferenceTime = 4,
   kBtDlrr = 5,
   kBtVoipMetric = 7
 };
 
-bool RTCPParseCommonHeader(const uint8_t* ptrDataBegin,
-                           const uint8_t* ptrDataEnd,
-                           RTCPCommonHeader& parsedHeader);
+bool RtcpParseCommonHeader(const uint8_t* buffer,
+                           size_t size_bytes,
+                           RtcpCommonHeader* parsed_header);
 
 class RTCPParserV2 {
  public:
   RTCPParserV2(
       const uint8_t* rtcpData,
       size_t rtcpDataLength,
       bool rtcpReducedSizeEnable);  // Set to true, to allow non-compound RTCP!
   ~RTCPParserV2();
 
   RTCPPacketTypes PacketType() const;
@@ skipping 62 matching lines @@
   bool ParseIJItem();
 
   bool ParseXr();
   bool ParseXrItem();
   bool ParseXrReceiverReferenceTimeItem(int block_length_4bytes);
   bool ParseXrDlrr(int block_length_4bytes);
   bool ParseXrDlrrItem();
   bool ParseXrVoipMetricItem(int block_length_4bytes);
   bool ParseXrUnsupportedBlockType(int block_length_4bytes);
 
-  bool ParseFBCommon(const RTCPCommonHeader& header);
+  bool ParseFBCommon(const RtcpCommonHeader& header);
   bool ParseNACKItem();
   bool ParseTMMBRItem();
   bool ParseTMMBNItem();
   bool ParseSLIItem();
   bool ParseRPSIItem();
   bool ParseFIRItem();
   bool ParsePsfbAppItem();
   bool ParsePsfbREMBItem();
 
-  bool ParseAPP(const RTCPCommonHeader& header);
+  bool ParseAPP(const RtcpCommonHeader& header);
   bool ParseAPPItem();
 
  private:
   const uint8_t* const _ptrRTCPDataBegin;
   const bool _RTCPReducedSizeEnable;
   const uint8_t* const _ptrRTCPDataEnd;
 
   bool _validPacket;
   const uint8_t* _ptrRTCPData;
   const uint8_t* _ptrRTCPBlockEnd;
 
   ParseState _state;
   uint8_t _numberOfBlocks;
 
   RTCPPacketTypes _packetType;
   RTCPPacket _packet;
 };
 
 class RTCPPacketIterator {
  public:
   RTCPPacketIterator(uint8_t* rtcpData, size_t rtcpDataLength);
   ~RTCPPacketIterator();
 
-  const RTCPCommonHeader* Begin();
-  const RTCPCommonHeader* Iterate();
-  const RTCPCommonHeader* Current();
+  const RtcpCommonHeader* Begin();
+  const RtcpCommonHeader* Iterate();
+  const RtcpCommonHeader* Current();
 
  private:
   uint8_t* const _ptrBegin;
   uint8_t* const _ptrEnd;
 
   uint8_t* _ptrBlock;
 
-  RTCPCommonHeader _header;
+  RtcpCommonHeader _header;
 };
 }  // RTCPUtility
 }  // namespace webrtc
 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_