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

webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
index 275b007bef226414635ef4c7a938876321e34ff4..a15bec94169c96b154e80874e6d5a413c4fce643 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
@@ -10,9 +10,13 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "webrtc/base/checks.h"
+#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 
 namespace webrtc {
+namespace rtcp {
 
 TEST(RtcpUtilityTest, MidNtp) {
   const uint32_t kNtpSec = 0x12345678;
@@ -68,5 +72,95 @@ TEST(RtcpUtilityTest, NackRequestsWithWrap) {
   EXPECT_EQ(8U, stats.requests());
 }
 
+// Override RtcpPacket so we can test protected methods.

[åsapersson, 2015/09/10 13:27:33]

override RtcpPacket?

[sprang_webrtc, 2015/09/11 13:03:19]

Done.

+class RtcpPacketHeaderTest : public ::testing::Test, protected RtcpPacket {

[åsapersson, 2015/09/10 13:27:33]

maybe call the test RtcpParseCommonHeaderTest

[sprang_webrtc, 2015/09/11 13:03:19]

Done.

+ public:
+  RtcpPacketHeaderTest() { memset(buffer, 0, kBufferCapacityBytes); }
+
+  virtual ~RtcpPacketHeaderTest() {}
+
+  bool Create(uint8_t* packet,
+              size_t* index,
+              size_t max_length,
+              PacketReadyCallback* callback) const override {
+    RTC_NOTREACHED();
+    return false;
+  }
+
+  size_t BlockLength() const { return 0; }
+
+ protected:
+  static const size_t kHeaderSizeBytes = 4;

[åsapersson, 2015/09/10 13:27:33]

use the define in RtcpCommonHeader

[sprang_webrtc, 2015/09/11 13:03:19]

Done.

+  static const size_t kBufferCapacityBytes = 40;
+  uint8_t buffer[kBufferCapacityBytes];
+  RTCPUtility::RtcpCommonHeader header;
+};
+
+TEST_F(RtcpPacketHeaderTest, TooSmallBuffer) {
+  // Buffer needs to be able to hold the header.
+  for (size_t i = 0; i < kHeaderSizeBytes; ++i)
+    EXPECT_FALSE(RtcpParseCommonHeader(buffer, i, &header));
+}
+
+TEST_F(RtcpPacketHeaderTest, Version) {
+  // Version 2 is the only allowed for now.
+  for (int v = 0; v < 4; ++v) {
+    buffer[0] = v << 6;
+    EXPECT_EQ(v == 2, RtcpParseCommonHeader(buffer, kHeaderSizeBytes, &header));
+  }
+}
+
+TEST_F(RtcpPacketHeaderTest, PacketSize) {
+  // Set v = 2, leave p, fmt, pt as 0.
+  buffer[0] = 2 << 6;
+
+  const size_t kBlockSize = 3;
+  ByteWriter<uint16_t>::WriteBigEndian(&buffer[2], kBlockSize);
+  const size_t kSizeInBytes = (kBlockSize + 1) * 4;
+
+  EXPECT_FALSE(RtcpParseCommonHeader(buffer, kSizeInBytes - 1, &header));
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, kSizeInBytes, &header));
+}
+
+TEST_F(RtcpPacketHeaderTest, PayloadSize) {
+  // Set v = 2, p = 1, but leave fmt, pt as 0.
+  buffer[0] = (2 << 6) | (1 << 5);
+
+  const size_t kBlockSize = 3;
+  ByteWriter<uint16_t>::WriteBigEndian(&buffer[2], kBlockSize);
+  const size_t kSizeInBytes = (kBlockSize + 1) * 4;
+  const size_t kPayloadSizeBytes = kSizeInBytes - kHeaderSizeBytes;
+
+  // Padding one byte larger than possible.
+  buffer[kSizeInBytes - 1] = kPayloadSizeBytes + 1;
+  EXPECT_FALSE(RtcpParseCommonHeader(buffer, kSizeInBytes, &header));
+
+  // Pure padding packet?
+  buffer[kSizeInBytes - 1] = kPayloadSizeBytes;
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, kSizeInBytes, &header));
+  EXPECT_EQ(kPayloadSizeBytes, header.padding_bytes);
+  EXPECT_EQ(0u, header.payload_size_bytes);
+
+  // Single byte of actual data.
+  buffer[kSizeInBytes - 1] = kPayloadSizeBytes - 1;
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, kSizeInBytes, &header));
+  EXPECT_EQ(kPayloadSizeBytes - 1, header.padding_bytes);
+  EXPECT_EQ(1u, header.payload_size_bytes);
+}
+
+TEST_F(RtcpPacketHeaderTest, FormatAndPayloadType) {
+  // Format/count and packet type both set to max values.
+  const uint8_t kCountOrFormat = 0x1F;
+  const uint8_t kPacketType = 0xFF;
+  buffer[0] = 2 << 6;  // V = 2.
+  buffer[0] |= kCountOrFormat;
+  buffer[1] = kPacketType;
+
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, kHeaderSizeBytes, &header));
+  EXPECT_EQ(kCountOrFormat, header.count_or_format);
+  EXPECT_EQ(kPacketType, header.packet_type);
+}
+
+}  // namespace rtcp
 }  // namespace webrtc