Implement FrameMarking header extension support

webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 776db53385e30a04c49cbb1d03a35b5fed1d5ed3..c50380f6981aebf17211e5fe296a04a90c488386 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -33,6 +33,7 @@ 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;
@@ -76,6 +77,27 @@ constexpr uint8_t kPacketWithMid[] = {
     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;
@@ -196,6 +218,64 @@ TEST(RtpPacketTest, TryToCreateWithLongMid) {
   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);