| 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..0bda293ae3e55685b41582a8242ff496791797c4 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,20 @@ 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 uint32_t kCsrcs[] = {0x34567890, 0x32435465};
|
| constexpr uint8_t kPayload[] = {'p', 'a', 'y', 'l', 'o', 'a', 'd'};
|
| constexpr uint8_t kPacketPaddingSize = 8;
|
| @@ -159,6 +174,34 @@ 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, CreateWithExtensionsWithoutManager) {
|
| RtpPacketToSend packet(nullptr);
|
| packet.SetPayloadType(kPayloadType);
|
|
|