admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect behavior in H264 packetizer in some cases

Browse Source 
Just ignoring single_packet_reduction_len is wrong, because if the
fragment is put in a single packet it might still be the first or the
last packet in the whole sequence.

Bug: none
Change-Id: I4a2fbebe1d49cbef9298bb32d9cecaa617e4dfc3
Reviewed-on: https://webrtc-review.googlesource.com/c/115403
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26084}
This commit is contained in:
Ilya Nikolaevskiy 2018-12-21 13:16:16 +01:00 committed by Commit Bot
parent d0def19069
commit ea7e7a9753
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/rtp_rtcp/source/rtp_format_h264.cc
View File

@ -219,10 +219,19 @@ bool RtpPacketizerH264::PacketizeFuA(size_t fragment_index) {
PayloadSizeLimits limits = limits_;
// Leave room for the FU-A header.
limits.max_payload_len -= kFuAHeaderSize;
// Ignore single/first/last packet reductions unless it is single/first/last
// Update single/first/last packet reductions unless it is single/first/last
// fragment.
if (input_fragments_.size() != 1)
limits.single_packet_reduction_len = 0;
if (input_fragments_.size() != 1) {
// if this fragment is put into a single packet, it might still be the
// first or the last packet in the whole sequence of packets.
if (fragment_index == input_fragments_.size() - 1) {
limits.single_packet_reduction_len = limits_.last_packet_reduction_len;
} else if (fragment_index == 0) {
limits.single_packet_reduction_len = limits_.first_packet_reduction_len;
} else {
limits.single_packet_reduction_len = 0;
}
}
if (fragment_index != 0)
limits.first_packet_reduction_len = 0;
if (fragment_index != input_fragments_.size() - 1)

22
modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
View File

@ -379,6 +379,28 @@ TEST(RtpPacketizerH264Test, MixedStapAFUA) {
ElementsAreArray(next_fragment, kStapANaluSize));
}
TEST(RtpPacketizerH264Test, LastFragmentFitsInSingleButNotLastPacket) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 1178;
limits.first_packet_reduction_len = 0;
limits.last_packet_reduction_len = 20;
limits.single_packet_reduction_len = 20;
// Actual sizes, which triggered this bug.
size_t fragments[] = {20, 8, 18, 1161};
RTPFragmentationHeader fragmentation = CreateFragmentation(fragments);
rtc::Buffer frame = CreateFrame(fragmentation);
RtpPacketizerH264 packetizer(
frame, limits, H264PacketizationMode::NonInterleaved, fragmentation);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
// Last packet has to be of correct size.
// Incorrect implementation might miss this constraint and not split the last
// fragment in two packets.
EXPECT_LE(static_cast<int>(packets.back().payload_size()),
limits.max_payload_len - limits.last_packet_reduction_len);
}
// Splits frame with payload size |frame_payload_size| without fragmentation,
// Returns sizes of the payloads excluding fua headers.
std::vector<int> TestFua(size_t frame_payload_size,