Implement FrameMarking header extension support

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"
@@ skipping 15 matching lines @@
 constexpr uint32_t kSsrc = 0x12345678;
 constexpr uint16_t kSeqNum = 0x1234;
 constexpr uint8_t kSeqNumFirstByte = kSeqNum >> 8;
 constexpr uint8_t kSeqNumSecondByte = kSeqNum & 0xff;
 constexpr uint32_t kTimestamp = 0x65431278;
 constexpr uint8_t kTransmissionOffsetExtensionId = 1;
 constexpr uint8_t kAudioLevelExtensionId = 9;
 constexpr uint8_t kRtpStreamIdExtensionId = 0xa;
 constexpr uint8_t kRtpMidExtensionId = 0xb;
 constexpr uint8_t kVideoTimingExtensionId = 0xc;
+constexpr uint8_t kRtpFrameMarkingExtensionId = 8;
 constexpr int32_t kTimeOffset = 0x56ce;
 constexpr bool kVoiceActive = true;
 constexpr uint8_t kAudioLevel = 0x5a;
 constexpr char kStreamId[] = "streamid";
 constexpr char kMid[] = "mid";
 constexpr size_t kMaxPaddingSize = 224u;
 // clang-format off
 constexpr uint8_t kMinimumPacket[] = {
     0x80, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
     0x65, 0x43, 0x12, 0x78,
@@ skipping 23 matching lines @@
     'e',  'a',  'm',  'i',
     'd' , 0x00, 0x00, 0x00};
 
 constexpr uint8_t kPacketWithMid[] = {
     0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0xbe, 0xde, 0x00, 0x01,
     0xb2, 'm', 'i', 'd'};
 
+constexpr uint8_t kPacketWithFrameMarks[] = {
+    0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
+    0x65, 0x43, 0x12, 0x78,
+    0x12, 0x34, 0x56, 0x78,
+    0xbe, 0xde, 0x00, 0x01,
+    0x80, 0xe0, 0x00, 0x00};  // S:1 E:1 I:1 D:0 TID:0
+
+constexpr uint8_t kPacketWithFrameMarksSVC[] = {
+    0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
+    0x65, 0x43, 0x12, 0x78,
+    0x12, 0x34, 0x56, 0x78,
+    0xbe, 0xde, 0x00, 0x01,
+    0x82, 0xe1, 0x00, 0x00};  // S:1 E:1 I:1 D:0 TID:1
+
+constexpr uint8_t kPacketWithFrameMarksSVCVP9[] = {
+    0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
+    0x65, 0x43, 0x12, 0x78,
+    0x12, 0x34, 0x56, 0x78,
+    0xbe, 0xde, 0x00, 0x01,
+    0x82, 0xe1, 0x1a, 0x00};  // S:1 E:1 I:1 D:0 TID:1 P:1 U:1 SID: 2
+
 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, kSeqNumFirstByte, kSeqNumSecondByte,
     0x65, 0x43, 0x12, 0x78,
     0x12, 0x34, 0x56, 0x78,
     0x34, 0x56, 0x78, 0x90,
     0x32, 0x43, 0x54, 0x65,
     0xbe, 0xde, 0x00, 0x01,
@@ skipping 100 matching lines @@
 
 TEST(RtpPacketTest, TryToCreateWithLongMid) {
   RtpPacketToSend::ExtensionManager extensions;
   constexpr char kLongMid[] = "LoooooooooonogMid";
   ASSERT_EQ(strlen(kLongMid), 17u);
   extensions.Register<RtpMid>(kRtpMidExtensionId);
   RtpPacketToSend packet(&extensions);
   EXPECT_FALSE(packet.SetExtension<RtpMid>(kLongMid));
 }
 
+TEST(RtpPacketTest, CreateWithFrameMarks) {
+  RtpPacketToSend::ExtensionManager extensions;
+  extensions.Register<FrameMarking>(kRtpFrameMarkingExtensionId);
+  RtpPacketToSend packet(&extensions);
+  packet.SetPayloadType(kPayloadType);
+  packet.SetSequenceNumber(kSeqNum);
+  packet.SetTimestamp(kTimestamp);
+  packet.SetSsrc(kSsrc);
+  FrameMarks frame_marks;  // S:1 E:1 I:1 D:0 TID:0
+  frame_marks.start_of_frame = true;
+  frame_marks.end_of_frame = true;
+  frame_marks.independent = true;
+  EXPECT_TRUE(packet.SetExtension<FrameMarking>(frame_marks));
+  EXPECT_THAT(kPacketWithFrameMarks,
+              ElementsAreArray(packet.data(), packet.size()));
+}
+
+TEST(RtpPacketTest, CreateWithFrameMarksSVC) {
+  RtpPacketToSend::ExtensionManager extensions;
+  extensions.Register<FrameMarking>(kRtpFrameMarkingExtensionId);
+  RtpPacketToSend packet(&extensions);
+  packet.SetPayloadType(kPayloadType);
+  packet.SetSequenceNumber(kSeqNum);
+  packet.SetTimestamp(kTimestamp);
+  packet.SetSsrc(kSsrc);
+  FrameMarks frame_marks;  // S:1 E:1 I:1 D:0 TID:1
+  frame_marks.start_of_frame = true;
+  frame_marks.end_of_frame = true;
+  frame_marks.independent = true;
+  frame_marks.temporal_layer_id = 1;
+  EXPECT_TRUE(packet.SetExtension<FrameMarking>(frame_marks));
+  EXPECT_THAT(kPacketWithFrameMarksSVC,
+              ElementsAreArray(packet.data(), packet.size()));
+}
+
+TEST(RtpPacketTest, CreateWithFrameMarksSVCVP9) {
+  RtpPacketToSend::ExtensionManager extensions;
+  extensions.Register<FrameMarking>(kRtpFrameMarkingExtensionId);
+  RtpPacketToSend packet(&extensions);
+  packet.SetPayloadType(kPayloadType);
+  packet.SetSequenceNumber(kSeqNum);
+  packet.SetTimestamp(kTimestamp);
+  packet.SetSsrc(kSsrc);
+  FrameMarks frame_marks;  // S:1 E:1 I:1 D:0 TID:1 P:1 U:1 SID: 2
+  frame_marks.start_of_frame = true;
+  frame_marks.end_of_frame = true;
+  frame_marks.independent = true;
+  frame_marks.temporal_layer_id = 1;
+  RTPVideoHeaderVP9 vp9;
+  vp9.spatial_idx = 2;
+  vp9.temporal_up_switch = true;
+  vp9.inter_pic_predicted = true;
+  frame_marks.layer_id = FrameMarking::CreateLayerId(vp9);
+  EXPECT_TRUE(packet.SetExtension<FrameMarking>(frame_marks));
+  EXPECT_THAT(kPacketWithFrameMarksSVCVP9,
+              ElementsAreArray(packet.data(), packet.size()));
+}
+
 TEST(RtpPacketTest, CreateWithExtensionsWithoutManager) {
   RtpPacketToSend packet(nullptr);
   packet.SetPayloadType(kPayloadType);
   packet.SetSequenceNumber(kSeqNum);
   packet.SetTimestamp(kTimestamp);
   packet.SetSsrc(kSsrc);
 
   auto raw = packet.AllocateRawExtension(kTransmissionOffsetExtensionId,
                                          TransmissionOffset::kValueSizeBytes);
   EXPECT_EQ(raw.size(), TransmissionOffset::kValueSizeBytes);
@@ skipping 348 matching lines @@
   VideoSendTiming receivied_timing;
   EXPECT_TRUE(packet.GetExtension<VideoTimingExtension>(&receivied_timing));
 
   // Check first and last timestamp are still OK. Flags should now be 0.
   EXPECT_EQ(receivied_timing.encode_start_delta_ms, 1);
   EXPECT_EQ(receivied_timing.pacer_exit_delta_ms, 4);
   EXPECT_EQ(receivied_timing.flags, 0);
 }
 
 }  // namespace webrtc