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

Use signed integers for limiting packet size in video packetizers

Browse Source 
Using signed integers allows to centralize checking of edge cases
in RtpPacketizer::SplitAboutEqually and
reduce chance of hitting issues with size_t underflow

Bug: webrtc:9680
Change-Id: Ic05bf0a9565a277c4608f43061ca46cf44e82d08
Reviewed-on: https://webrtc-review.googlesource.com/98602
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24618}
This commit is contained in:
Danil Chapovalov
2018-09-07 10:57:26 +02:00
committed by Commit Bot
parent 5e2e66d8a0
commit fa5ec8d20d
8 changed files with 125 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
modules/rtp_rtcp/source/rtp_format_unittest.cc
View File

@ -31,7 +31,7 @@ using ::testing::SizeIs;
// adjustement provided by limits,
// i.e. last packet expected to be smaller than 'average' by reduction_len.
int EffectivePacketsSizeDifference(
std::vector<size_t> sizes,
std::vector<int> sizes,
const RtpPacketizer::PayloadSizeLimits& limits) {
// Account for larger last packet header.
sizes.back() += limits.last_packet_reduction_len;
@ -41,7 +41,7 @@ int EffectivePacketsSizeDifference(
return *minmax.second - *minmax.first;
}
size_t Sum(const std::vector<size_t>& sizes) {
int Sum(const std::vector<int>& sizes) {
return std::accumulate(sizes.begin(), sizes.end(), 0);
}
@ -50,8 +50,7 @@ TEST(RtpPacketizerSplitAboutEqually, AllPacketsAreEqualSumToPayloadLen) {
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
EXPECT_THAT(Sum(payload_sizes), 13);
}
@ -61,8 +60,7 @@ TEST(RtpPacketizerSplitAboutEqually, AllPacketsAreEqualRespectsMaxPayloadSize) {
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
EXPECT_THAT(payload_sizes, Each(Le(limits.max_payload_len)));
}
@ -73,8 +71,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 5;
limits.first_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
ASSERT_THAT(payload_sizes, Not(IsEmpty()));
EXPECT_EQ(payload_sizes.front() + limits.first_packet_reduction_len,
@ -87,8 +84,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
ASSERT_THAT(payload_sizes, Not(IsEmpty()));
EXPECT_LE(payload_sizes.back() + limits.last_packet_reduction_len,
@ -100,8 +96,7 @@ TEST(RtpPacketizerSplitAboutEqually, AllPacketsAreEqualInSize) {
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
EXPECT_EQ(EffectivePacketsSizeDifference(payload_sizes, limits), 0);
}
@ -112,8 +107,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 2;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(13, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(13, limits);
// Computed by hand. 3 packets would have exactly capacity 3*5-2=13
// (max length - for each packet minus last packet reduction).
EXPECT_THAT(payload_sizes, SizeIs(3));
@ -124,8 +118,7 @@ TEST(RtpPacketizerSplitAboutEqually, SomePacketsAreSmallerSumToPayloadLen) {
limits.max_payload_len = 7;
limits.last_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(28, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(28, limits);
EXPECT_THAT(Sum(payload_sizes), 28);
}
@ -136,8 +129,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 7;
limits.last_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(28, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(28, limits);
EXPECT_THAT(payload_sizes, Each(Le(limits.max_payload_len)));
}
@ -148,8 +140,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 7;
limits.first_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(28, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(28, limits);
EXPECT_LE(payload_sizes.front() + limits.first_packet_reduction_len,
limits.max_payload_len);
@ -161,8 +152,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 7;
limits.last_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(28, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(28, limits);
EXPECT_LE(payload_sizes.back(),
limits.max_payload_len - limits.last_packet_reduction_len);
@ -174,8 +164,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 7;
limits.last_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(28, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(28, limits);
EXPECT_LE(EffectivePacketsSizeDifference(payload_sizes, limits), 1);
}
@ -186,8 +175,7 @@ TEST(RtpPacketizerSplitAboutEqually,
limits.max_payload_len = 7;
limits.last_packet_reduction_len = 5;
std::vector<size_t> payload_sizes =
RtpPacketizer::SplitAboutEqually(24, limits);
std::vector<int> payload_sizes = RtpPacketizer::SplitAboutEqually(24, limits);
// Computed by hand. 4 packets would have capacity 4*7-5=23 (max length -
// for each packet minus last packet reduction).
// 5 packets is enough for kPayloadSize.
@ -203,11 +191,11 @@ TEST(RtpPacketizerSplitAboutEqually, GivesNonZeroPayloadLengthEachPacket) {
// Naive implementation would split 1450 payload + 1050 reduction bytes into 5
// packets 500 bytes each, thus leaving first packet zero bytes and even less
// to last packet.
std::vector<size_t> payload_sizes =
std::vector<int> payload_sizes =
RtpPacketizer::SplitAboutEqually(1450, limits);
EXPECT_EQ(Sum(payload_sizes), 1450u);
EXPECT_THAT(payload_sizes, Each(Gt(0u)));
EXPECT_EQ(Sum(payload_sizes), 1450);
EXPECT_THAT(payload_sizes, Each(Gt(0)));
}
TEST(RtpPacketizerSplitAboutEqually,
@ -232,5 +220,55 @@ TEST(RtpPacketizerSplitAboutEqually,
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(20, limits), ElementsAre(9, 11));
}
TEST(RtpPacketizerSplitAboutEqually, RejectsZeroMaxPayloadLen) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 0;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(20, limits), IsEmpty());
}
TEST(RtpPacketizerSplitAboutEqually, RejectsZeroFirstPacketLen) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 5;
limits.first_packet_reduction_len = 5;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(20, limits), IsEmpty());
}
TEST(RtpPacketizerSplitAboutEqually, RejectsZeroLastPacketLen) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 5;
limits.last_packet_reduction_len = 5;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(20, limits), IsEmpty());
}
TEST(RtpPacketizerSplitAboutEqually, CantPutSinglePayloadByteInTwoPackets) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 10;
limits.first_packet_reduction_len = 6;
limits.last_packet_reduction_len = 4;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(1, limits), IsEmpty());
}
TEST(RtpPacketizerSplitAboutEqually, CanPutTwoPayloadBytesInTwoPackets) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 10;
limits.first_packet_reduction_len = 6;
limits.last_packet_reduction_len = 4;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(2, limits), ElementsAre(1, 1));
}
TEST(RtpPacketizerSplitAboutEqually, CanPutSinglePayloadByteInOnePacket) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 11;
limits.first_packet_reduction_len = 6;
limits.last_packet_reduction_len = 4;
EXPECT_THAT(RtpPacketizer::SplitAboutEqually(1, limits), ElementsAre(1));
}
} // namespace
} // namespace webrtc