Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc

Issue 2954503002: Implement FrameMarking header extension support
Patch Set: Implement FrameMarking header extension and tests Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" 10 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
(...skipping 13 matching lines...) Expand all
24 24
25 constexpr int8_t kPayloadType = 100; 25 constexpr int8_t kPayloadType = 100;
26 constexpr uint32_t kSsrc = 0x12345678; 26 constexpr uint32_t kSsrc = 0x12345678;
27 constexpr uint16_t kSeqNum = 0x1234; 27 constexpr uint16_t kSeqNum = 0x1234;
28 constexpr uint8_t kSeqNumFirstByte = kSeqNum >> 8; 28 constexpr uint8_t kSeqNumFirstByte = kSeqNum >> 8;
29 constexpr uint8_t kSeqNumSecondByte = kSeqNum & 0xff; 29 constexpr uint8_t kSeqNumSecondByte = kSeqNum & 0xff;
30 constexpr uint32_t kTimestamp = 0x65431278; 30 constexpr uint32_t kTimestamp = 0x65431278;
31 constexpr uint8_t kTransmissionOffsetExtensionId = 1; 31 constexpr uint8_t kTransmissionOffsetExtensionId = 1;
32 constexpr uint8_t kAudioLevelExtensionId = 9; 32 constexpr uint8_t kAudioLevelExtensionId = 9;
33 constexpr uint8_t kRtpStreamIdExtensionId = 0xa; 33 constexpr uint8_t kRtpStreamIdExtensionId = 0xa;
34 constexpr uint8_t kRtpFrameMarkingExtensionId = 8;
34 constexpr int32_t kTimeOffset = 0x56ce; 35 constexpr int32_t kTimeOffset = 0x56ce;
35 constexpr bool kVoiceActive = true; 36 constexpr bool kVoiceActive = true;
36 constexpr uint8_t kAudioLevel = 0x5a; 37 constexpr uint8_t kAudioLevel = 0x5a;
37 constexpr char kStreamId[] = "streamid"; 38 constexpr char kStreamId[] = "streamid";
38 constexpr size_t kMaxPaddingSize = 224u; 39 constexpr size_t kMaxPaddingSize = 224u;
39 // clang-format off 40 // clang-format off
40 constexpr uint8_t kMinimumPacket[] = { 41 constexpr uint8_t kMinimumPacket[] = {
41 0x80, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte, 42 0x80, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
42 0x65, 0x43, 0x12, 0x78, 43 0x65, 0x43, 0x12, 0x78,
43 0x12, 0x34, 0x56, 0x78}; 44 0x12, 0x34, 0x56, 0x78};
(...skipping 15 matching lines...) Expand all
59 60
60 constexpr uint8_t kPacketWithRsid[] = { 61 constexpr uint8_t kPacketWithRsid[] = {
61 0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte, 62 0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
62 0x65, 0x43, 0x12, 0x78, 63 0x65, 0x43, 0x12, 0x78,
63 0x12, 0x34, 0x56, 0x78, 64 0x12, 0x34, 0x56, 0x78,
64 0xbe, 0xde, 0x00, 0x03, 65 0xbe, 0xde, 0x00, 0x03,
65 0xa7, 's', 't', 'r', 66 0xa7, 's', 't', 'r',
66 'e', 'a', 'm', 'i', 67 'e', 'a', 'm', 'i',
67 'd' , 0x00, 0x00, 0x00}; 68 'd' , 0x00, 0x00, 0x00};
68 69
70 constexpr uint8_t kPacketWithFrameMarks[] = {
71 0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
72 0x65, 0x43, 0x12, 0x78,
73 0x12, 0x34, 0x56, 0x78,
74 0xbe, 0xde, 0x00, 0x01,
75 0x80, 0xe0, 0x00, 0x00}; // S:1 E:1 I:1 D:0 TID:1
76
77 constexpr uint8_t kPacketWithFrameMarksSVC[] = {
78 0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
79 0x65, 0x43, 0x12, 0x78,
80 0x12, 0x34, 0x56, 0x78,
81 0xbe, 0xde, 0x00, 0x01,
82 0x82, 0xe1, 0x00, 0x00}; // S:1 E:1 I:1 D:0 TID:1
83
69 constexpr uint32_t kCsrcs[] = {0x34567890, 0x32435465}; 84 constexpr uint32_t kCsrcs[] = {0x34567890, 0x32435465};
70 constexpr uint8_t kPayload[] = {'p', 'a', 'y', 'l', 'o', 'a', 'd'}; 85 constexpr uint8_t kPayload[] = {'p', 'a', 'y', 'l', 'o', 'a', 'd'};
71 constexpr uint8_t kPacketPaddingSize = 8; 86 constexpr uint8_t kPacketPaddingSize = 8;
72 constexpr uint8_t kPacket[] = { 87 constexpr uint8_t kPacket[] = {
73 0xb2, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte, 88 0xb2, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
74 0x65, 0x43, 0x12, 0x78, 89 0x65, 0x43, 0x12, 0x78,
75 0x12, 0x34, 0x56, 0x78, 90 0x12, 0x34, 0x56, 0x78,
76 0x34, 0x56, 0x78, 0x90, 91 0x34, 0x56, 0x78, 0x90,
77 0x32, 0x43, 0x54, 0x65, 92 0x32, 0x43, 0x54, 0x65,
78 0xbe, 0xde, 0x00, 0x01, 93 0xbe, 0xde, 0x00, 0x01,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 167
153 TEST(RtpPacketTest, TryToCreateWithLongRsid) { 168 TEST(RtpPacketTest, TryToCreateWithLongRsid) {
154 RtpPacketToSend::ExtensionManager extensions; 169 RtpPacketToSend::ExtensionManager extensions;
155 constexpr char kLongStreamId[] = "LoooooooooongRsid"; 170 constexpr char kLongStreamId[] = "LoooooooooongRsid";
156 ASSERT_EQ(strlen(kLongStreamId), 17u); 171 ASSERT_EQ(strlen(kLongStreamId), 17u);
157 extensions.Register<RtpStreamId>(kRtpStreamIdExtensionId); 172 extensions.Register<RtpStreamId>(kRtpStreamIdExtensionId);
158 RtpPacketToSend packet(&extensions); 173 RtpPacketToSend packet(&extensions);
159 EXPECT_FALSE(packet.SetExtension<RtpStreamId>(kLongStreamId)); 174 EXPECT_FALSE(packet.SetExtension<RtpStreamId>(kLongStreamId));
160 } 175 }
161 176
177 TEST(RtpPacketTest, CreateWithFrameMarks) {
178 RtpPacketToSend::ExtensionManager extensions;
179 extensions.Register<FrameMarking>(kRtpFrameMarkingExtensionId);
180 RtpPacketToSend packet(&extensions);
181 packet.SetPayloadType(kPayloadType);
182 packet.SetSequenceNumber(kSeqNum);
183 packet.SetTimestamp(kTimestamp);
184 packet.SetSsrc(kSsrc);
185 FrameMarks frame_marks = {true, true, true, false, false, 0, 0, 0};
186 EXPECT_TRUE(packet.SetExtension<FrameMarking>(frame_marks));
187 EXPECT_THAT(kPacketWithFrameMarks,
188 ElementsAreArray(packet.data(), packet.size()));
189 }
190
191 TEST(RtpPacketTest, CreateWithFrameMarksSVC) {
192 RtpPacketToSend::ExtensionManager extensions;
193 extensions.Register<FrameMarking>(kRtpFrameMarkingExtensionId);
194 RtpPacketToSend packet(&extensions);
195 packet.SetPayloadType(kPayloadType);
196 packet.SetSequenceNumber(kSeqNum);
197 packet.SetTimestamp(kTimestamp);
198 packet.SetSsrc(kSsrc);
199 FrameMarks frame_marks = {true, true, true, false, false, 1, 0, 0};
200 EXPECT_TRUE(packet.SetExtension<FrameMarking>(frame_marks));
201 EXPECT_THAT(kPacketWithFrameMarksSVC,
202 ElementsAreArray(packet.data(), packet.size()));
203 }
204
162 TEST(RtpPacketTest, CreateWithExtensionsWithoutManager) { 205 TEST(RtpPacketTest, CreateWithExtensionsWithoutManager) {
163 RtpPacketToSend packet(nullptr); 206 RtpPacketToSend packet(nullptr);
164 packet.SetPayloadType(kPayloadType); 207 packet.SetPayloadType(kPayloadType);
165 packet.SetSequenceNumber(kSeqNum); 208 packet.SetSequenceNumber(kSeqNum);
166 packet.SetTimestamp(kTimestamp); 209 packet.SetTimestamp(kTimestamp);
167 packet.SetSsrc(kSsrc); 210 packet.SetSsrc(kSsrc);
168 211
169 auto raw = packet.AllocateRawExtension(kTransmissionOffsetExtensionId, 212 auto raw = packet.AllocateRawExtension(kTransmissionOffsetExtensionId,
170 TransmissionOffset::kValueSizeBytes); 213 TransmissionOffset::kValueSizeBytes);
171 EXPECT_EQ(raw.size(), TransmissionOffset::kValueSizeBytes); 214 EXPECT_EQ(raw.size(), TransmissionOffset::kValueSizeBytes);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 ASSERT_TRUE(packet.Parse(kPacket, sizeof(kPacket))); 499 ASSERT_TRUE(packet.Parse(kPacket, sizeof(kPacket)));
457 500
458 EXPECT_FALSE(packet.HasRawExtension(kInvalidId)); 501 EXPECT_FALSE(packet.HasRawExtension(kInvalidId));
459 EXPECT_THAT(packet.GetRawExtension(kInvalidId), IsEmpty()); 502 EXPECT_THAT(packet.GetRawExtension(kInvalidId), IsEmpty());
460 const uint8_t kExtension[] = {'e', 'x', 't'}; 503 const uint8_t kExtension[] = {'e', 'x', 't'};
461 EXPECT_FALSE(packet.SetRawExtension(kInvalidId, kExtension)); 504 EXPECT_FALSE(packet.SetRawExtension(kInvalidId, kExtension));
462 EXPECT_THAT(packet.AllocateRawExtension(kInvalidId, 3), IsEmpty()); 505 EXPECT_THAT(packet.AllocateRawExtension(kInvalidId, 3), IsEmpty());
463 } 506 }
464 507
465 } // namespace webrtc 508 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698