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

Use zero octets for rtp packet padding

Browse Source 
RFC3550 Section 4 mention
"Octets designated as padding have the value zero."

Bug: None
Change-Id: Ife4c6226143c79ad7d152bc6099ba1d81f5492dd
Reviewed-on: https://webrtc-review.googlesource.com/c/103983
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25109}
This commit is contained in:
Danil Chapovalov
2018-10-10 14:56:01 +02:00
committed by Commit Bot
parent 3d255309e9
commit f7fcaf0885
6 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
namespace webrtc {
namespace {
using ::testing::Each;
using ::testing::ElementsAre;
using ::testing::ElementsAreArray;
using ::testing::IsEmpty;
@ -367,11 +368,10 @@ TEST(RtpPacketTest, CreatePurePadding) {
packet.SetSequenceNumber(kSeqNum);
packet.SetTimestamp(kTimestamp);
packet.SetSsrc(kSsrc);
Random random(0x123456789);
EXPECT_LT(packet.size(), packet.capacity());
EXPECT_FALSE(packet.SetPadding(kPaddingSize + 1, &random));
EXPECT_TRUE(packet.SetPadding(kPaddingSize, &random));
EXPECT_FALSE(packet.SetPadding(kPaddingSize + 1));
EXPECT_TRUE(packet.SetPadding(kPaddingSize));
EXPECT_EQ(packet.size(), packet.capacity());
}
@ -383,13 +383,48 @@ TEST(RtpPacketTest, CreateUnalignedPadding) {
packet.SetTimestamp(kTimestamp);
packet.SetSsrc(kSsrc);
packet.SetPayloadSize(kPayloadSize);
Random r(0x123456789);
EXPECT_LT(packet.size(), packet.capacity());
EXPECT_TRUE(packet.SetPadding(kMaxPaddingSize, &r));
EXPECT_TRUE(packet.SetPadding(kMaxPaddingSize));
EXPECT_EQ(packet.size(), packet.capacity());
}
TEST(RtpPacketTest, WritesPaddingSizeToLastByte) {
const size_t kPaddingSize = 5;
RtpPacket packet;
EXPECT_TRUE(packet.SetPadding(kPaddingSize));
EXPECT_EQ(packet.data()[packet.size() - 1], kPaddingSize);
}
TEST(RtpPacketTest, UsesZerosForPadding) {
const size_t kPaddingSize = 5;
RtpPacket packet;
EXPECT_TRUE(packet.SetPadding(kPaddingSize));
EXPECT_THAT(rtc::MakeArrayView(packet.data() + 12, kPaddingSize - 1),
Each(0));
}
TEST(RtpPacketTest, CreateOneBytePadding) {
size_t kPayloadSize = 123;
RtpPacket packet(nullptr, 12 + kPayloadSize + 1);
packet.SetPayloadSize(kPayloadSize);
EXPECT_TRUE(packet.SetPadding(1));
EXPECT_EQ(packet.size(), 12 + kPayloadSize + 1);
EXPECT_EQ(packet.padding_size(), 1u);
}
TEST(RtpPacketTest, FailsToAddPaddingWithoutCapacity) {
size_t kPayloadSize = 123;
RtpPacket packet(nullptr, 12 + kPayloadSize);
packet.SetPayloadSize(kPayloadSize);
EXPECT_FALSE(packet.SetPadding(1));
}
TEST(RtpPacketTest, ParseMinimum) {
RtpPacketReceived packet;
EXPECT_TRUE(packet.Parse(kMinimumPacket, sizeof(kMinimumPacket)));