Correct sequence-number injection into packets in rtp_packet_unittest.cc

webrtc/modules/rtp_rtcp/source/rtp_packet_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/rtp_packet_received.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
 
 #include "webrtc/base/random.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace {
 using ::testing::ElementsAreArray;
 using ::testing::IsEmpty;
 using ::testing::make_tuple;
 
 constexpr int8_t kPayloadType = 100;
 constexpr uint32_t kSsrc = 0x12345678;
-constexpr uint16_t kSeqNum = 88;
+constexpr uint16_t kSeqNum = 0x1234;
+constexpr uint8_t kSeqNumFirstHalf = kSeqNum >> 8;

[danilchap, 2017/05/24 14:52:16]

may be ...FirstByte

[eladalon, 2017/05/24 15:09:17]

Done.

+constexpr uint8_t kSeqNumSecondHalf = kSeqNum & 0xff;
 constexpr uint32_t kTimestamp = 0x65431278;
 constexpr uint8_t kTransmissionOffsetExtensionId = 1;
 constexpr uint8_t kAudioLevelExtensionId = 9;
 constexpr uint8_t kRtpStreamIdExtensionId = 0xa;
 constexpr int32_t kTimeOffset = 0x56ce;
 constexpr bool kVoiceActive = true;
 constexpr uint8_t kAudioLevel = 0x5a;
 constexpr char kStreamId[] = "streamid";
 constexpr size_t kMaxPaddingSize = 224u;
 // clang-format off
 constexpr uint8_t kMinimumPacket[] = {
-    0x80, kPayloadType, 0x00, kSeqNum,
+    0x80, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78};
 
 constexpr uint8_t kPacketWithTO[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0xbe, 0xde, 0x00, 0x01,
     0x12, 0x00, 0x56, 0xce};
 
 constexpr uint8_t kPacketWithTOAndAL[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0xbe, 0xde, 0x00, 0x02,
     0x12, 0x00, 0x56, 0xce,
     0x90, 0x80|kAudioLevel, 0x00, 0x00};
 
 constexpr uint8_t kPacketWithRsid[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0xbe, 0xde, 0x00, 0x03,
     0xa7, 's',  't',  'r',
     'e',  'a',  'm',  'i',
     'd' , 0x00, 0x00, 0x00};
 
 constexpr uint32_t kCsrcs[] = {0x34567890, 0x32435465};
 constexpr uint8_t kPayload[] = {'p', 'a', 'y', 'l', 'o', 'a', 'd'};
 constexpr uint8_t kPacketPaddingSize = 8;
 constexpr uint8_t kPacket[] = {
-    0xb2, kPayloadType, 0x00, kSeqNum,
+    0xb2, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0x34, 0x56, 0x78, 0x90,
     0x32, 0x43, 0x54, 0x65,
     0xbe, 0xde, 0x00, 0x01,
     0x12, 0x00, 0x56, 0xce,
     'p', 'a', 'y', 'l', 'o', 'a', 'd',
     'p', 'a', 'd', 'd', 'i', 'n', 'g', kPacketPaddingSize};
 
 constexpr uint8_t kPacketWithInvalidExtension[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,  // kTimestamp.
     0x12, 0x34, 0x56, 0x78,  // kSSrc.
     0xbe, 0xde, 0x00, 0x02,  // Extension block of size 2 x 32bit words.
     (kTransmissionOffsetExtensionId << 4) | 6,  // (6+1)-byte extension, but
            'e',  'x',  't',                     // Transmission Offset
      'd',  'a',  't',  'a',                     // expected to be 3-bytes.
      'p',  'a',  'y',  'l',  'o',  'a',  'd'
 };
 // clang-format on
 }  // namespace
@@ skipping 212 matching lines @@
   int32_t time_offset;
   EXPECT_FALSE(packet.GetExtension<TransmissionOffset>(&time_offset));
 
   // But shouldn't prevent reading payload.
   EXPECT_THAT(packet.payload(), ElementsAreArray(kPayload));
 }
 
 TEST(RtpPacketTest, ParseWithOverSizedExtension) {
   // clang-format off
   const uint8_t bad_packet[] = {
-      0x90, kPayloadType, 0x00, kSeqNum,
+      0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
       0x65, 0x43, 0x12, 0x78,  // kTimestamp.
       0x12, 0x34, 0x56, 0x78,  // kSsrc.
       0xbe, 0xde, 0x00, 0x01,  // Extension of size 1x32bit word.
       0x00,  // Add a byte of padding.
             0x12,  // Extension id 1 size (2+1).
                   0xda, 0x1a  // Only 2 bytes of extension payload.
   };
   // clang-format on
   RtpPacketToSend::ExtensionManager extensions;
   extensions.Register(TransmissionOffset::kId, 1);
@@ skipping 74 matching lines @@
   auto raw_extension = packet.GetRawExtension(kTransmissionOffsetExtensionId);
   EXPECT_EQ(raw_extension.size(), TransmissionOffset::kValueSizeBytes);
   EXPECT_TRUE(TransmissionOffset::Parse(raw_extension, &time_offset));
 
   EXPECT_EQ(time_offset, kTimeOffset);
 }
 
 TEST(RtpPacketTest, ParseDynamicSizeExtension) {
   // clang-format off
   const uint8_t kPacket1[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,  // Timestamp.
     0x12, 0x34, 0x56, 0x78,  // Ssrc.
     0xbe, 0xde, 0x00, 0x02,  // Extensions block of size 2x32bit words.
     0x21, 'H', 'D',          // Extension with id = 2, size = (1+1).
     0x12, 'r', 't', 'x',     // Extension with id = 1, size = (2+1).
     0x00};  // Extension padding.
   const uint8_t kPacket2[] = {
-    0x90, kPayloadType, 0x00, kSeqNum,
+    0x90, kPayloadType, kSeqNumFirstHalf, kSeqNumSecondHalf,
     0x65, 0x43, 0x12, 0x78,  // Timestamp.
     0x12, 0x34, 0x56, 0x79,  // Ssrc.
     0xbe, 0xde, 0x00, 0x01,  // Extensions block of size 1x32bit words.
     0x11, 'H', 'D',          // Extension with id = 1, size = (1+1).
     0x00};  // Extension padding.
   // clang-format on
   RtpPacketReceived::ExtensionManager extensions;
   extensions.Register<RtpStreamId>(1);
   extensions.Register<RepairedRtpStreamId>(2);
   RtpPacketReceived packet(&extensions);
@@ skipping 25 matching lines @@
   ASSERT_TRUE(packet.Parse(kPacket, sizeof(kPacket)));
 
   EXPECT_FALSE(packet.HasRawExtension(kInvalidId));
   EXPECT_THAT(packet.GetRawExtension(kInvalidId), IsEmpty());
   const uint8_t kExtension[] = {'e', 'x', 't'};
   EXPECT_FALSE(packet.SetRawExtension(kInvalidId, kExtension));
   EXPECT_THAT(packet.AllocateRawExtension(kInvalidId, 3), IsEmpty());
 }
 
 }  // namespace webrtc