zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge RtpPacket HasExtension and IsExtensionReserved functions

Browse Source 
RtpPacket doesn't keep difference between reserved and set extension.

Bug: None
Change-Id: I1c79f4ebd7ba20ae5da0194c3faa418050db7d8e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166340
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30316}
This commit is contained in:
Danil Chapovalov
2020-01-16 18:59:01 +01:00
committed by Commit Bot
parent f5c1f79a28
commit 629de6f7ed
6 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/rtp_rtcp/source/rtp_packet_unittest.cc
View File

@ -996,7 +996,7 @@ TEST(RtpPacketTest,
kFeedbackRequest->sequence_count);
}
TEST(RtpPacketTest, IsExtensionReserved) {
TEST(RtpPacketTest, ReservedExtensionsCountedAsSetExtension) {
// Register two extensions.
RtpPacketToSend::ExtensionManager extensions;
extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
@ -1011,9 +1011,9 @@ TEST(RtpPacketTest, IsExtensionReserved) {
// Only the extension that is both registered and reserved matches
// IsExtensionReserved().
EXPECT_FALSE(packet.IsExtensionReserved<VideoContentTypeExtension>());
EXPECT_FALSE(packet.IsExtensionReserved<AudioLevel>());
EXPECT_TRUE(packet.IsExtensionReserved<TransmissionOffset>());
EXPECT_FALSE(packet.HasExtension<VideoContentTypeExtension>());
EXPECT_FALSE(packet.HasExtension<AudioLevel>());
EXPECT_TRUE(packet.HasExtension<TransmissionOffset>());
}
// Tests that RtpPacket::RemoveExtension can successfully remove extensions.