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 44730fe9ddb3505bdebf20badcd3e1c9090d3957..4a2484e6a554d376a487cc122326b50432652d1d 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -31,6 +31,7 @@ constexpr uint32_t kTimestamp = 0x65431278;
 constexpr uint8_t kTransmissionOffsetExtensionId = 1;
 constexpr uint8_t kAudioLevelExtensionId = 9;
 constexpr uint8_t kRtpStreamIdExtensionId = 0xa;
+constexpr uint8_t kRtpFrameMarkingExtensionId = 8;
 constexpr int32_t kTimeOffset = 0x56ce;
 constexpr bool kVoiceActive = true;
 constexpr uint8_t kAudioLevel = 0x5a;
@@ -66,6 +67,27 @@ constexpr uint8_t kPacketWithRsid[] = {
     'e',  'a',  'm',  'i',
     'd' , 0x00, 0x00, 0x00};
 
+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:1
+
+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;
@@ -159,6 +181,53 @@ TEST(RtpPacketTest, TryToCreateWithLongRsid) {
   EXPECT_FALSE(packet.SetExtension<RtpStreamId>(kLongStreamId));
 }
 
+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 = {true, true, true, false, false, 0, 0, 0};
+  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 = {true, true, true, false, false, 1, 0, 0};
+  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 = {true, true, true, false, false, 1, 0, 0};
+  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);