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

webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.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/tmmbn.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/rtcp_packet_parser.h"
 
 using testing::ElementsAreArray;
 using testing::IsEmpty;
 using testing::make_tuple;
 using webrtc::rtcp::TmmbItem;
 using webrtc::rtcp::Tmmbn;
-using webrtc::RTCPUtility::RtcpCommonHeader;
-using webrtc::RTCPUtility::RtcpParseCommonHeader;
 
 namespace webrtc {
 namespace {
 const uint32_t kSenderSsrc = 0x12345678;
 const uint32_t kRemoteSsrc = 0x23456789;
 const uint32_t kBitrateBps = 312000;
 const uint16_t kOverhead = 0x1fe;
 const uint8_t kPacket[] = {0x84, 205,  0x00, 0x04,
                            0x12, 0x34, 0x56, 0x78,
                            0x00, 0x00, 0x00, 0x00,
                            0x23, 0x45, 0x67, 0x89,
                            0x0a, 0x61, 0x61, 0xfe};
-
-bool ParseTmmbn(const uint8_t* buffer, size_t length, Tmmbn* tmmbn) {
-  RtcpCommonHeader header;
-  EXPECT_TRUE(RtcpParseCommonHeader(buffer, length, &header));
-  EXPECT_EQ(length, header.BlockSize());
-  return tmmbn->Parse(header, buffer + RtcpCommonHeader::kHeaderSizeBytes);
-}
 }  // namespace
 
 TEST(RtcpPacketTmmbnTest, Create) {
   Tmmbn tmmbn;
   tmmbn.From(kSenderSsrc);
   tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
 
   rtc::Buffer packet = tmmbn.Build();
 
   EXPECT_THAT(make_tuple(packet.data(), packet.size()),
               ElementsAreArray(kPacket));
 }
 
 TEST(RtcpPacketTmmbnTest, Parse) {
   Tmmbn tmmbn;
-  EXPECT_TRUE(ParseTmmbn(kPacket, sizeof(kPacket), &tmmbn));
+  EXPECT_TRUE(test::ParseSinglePacket(kPacket, &tmmbn));
 
   const Tmmbn& parsed = tmmbn;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   ASSERT_EQ(1u, parsed.items().size());
   EXPECT_EQ(kRemoteSsrc, parsed.items().front().ssrc());
   EXPECT_EQ(kBitrateBps, parsed.items().front().bitrate_bps());
   EXPECT_EQ(kOverhead, parsed.items().front().packet_overhead());
 }
 
 TEST(RtcpPacketTmmbnTest, CreateAndParseWithoutItems) {
   Tmmbn tmmbn;
   tmmbn.From(kSenderSsrc);
 
   rtc::Buffer packet = tmmbn.Build();
   Tmmbn parsed;
-  EXPECT_TRUE(ParseTmmbn(packet.data(), packet.size(), &parsed));
+  EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.items(), IsEmpty());
 }
 
 TEST(RtcpPacketTmmbnTest, CreateAndParseWithTwoItems) {
   Tmmbn tmmbn;
   tmmbn.From(kSenderSsrc);
   tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
   tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc + 1, 4 * kBitrateBps, 40));
 
   rtc::Buffer packet = tmmbn.Build();
   Tmmbn parsed;
-  EXPECT_TRUE(ParseTmmbn(packet.data(), packet.size(), &parsed));
+  EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(2u, parsed.items().size());
   EXPECT_EQ(kRemoteSsrc, parsed.items()[0].ssrc());
   EXPECT_EQ(kBitrateBps, parsed.items()[0].bitrate_bps());
   EXPECT_EQ(kOverhead, parsed.items()[0].packet_overhead());
   EXPECT_EQ(kRemoteSsrc + 1, parsed.items()[1].ssrc());
   EXPECT_EQ(4 * kBitrateBps, parsed.items()[1].bitrate_bps());
   EXPECT_EQ(40U, parsed.items()[1].packet_overhead());
 }
 
 TEST(RtcpPacketTmmbnTest, ParseFailsOnTooSmallPacket) {
   const uint8_t kSmallPacket[] = {0x84, 205,  0x00, 0x01,
                                   0x12, 0x34, 0x56, 0x78};
   Tmmbn tmmbn;
-  EXPECT_FALSE(ParseTmmbn(kSmallPacket, sizeof(kSmallPacket), &tmmbn));
+  EXPECT_FALSE(test::ParseSinglePacket(kSmallPacket, &tmmbn));
 }
 
 TEST(RtcpPacketTmmbnTest, ParseFailsOnUnAlignedPacket) {
   const uint8_t kUnalignedPacket[] = {0x84,  205, 0x00, 0x03,
                                       0x12, 0x34, 0x56, 0x78,
                                       0x00, 0x00, 0x00, 0x00,
                                       0x23, 0x45, 0x67, 0x89};
 
   Tmmbn tmmbn;
-  EXPECT_FALSE(ParseTmmbn(kUnalignedPacket, sizeof(kUnalignedPacket), &tmmbn));
+  EXPECT_FALSE(test::ParseSinglePacket(kUnalignedPacket, &tmmbn));
 }
 }  // namespace webrtc