mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove DCHECK when processing StapA in h264_sps_pps_tracker.cc

Browse source 
When GenericFrameDescriptor or DependencyDescriptor RTP extensions are used, we may receive multiple consecutive StapA packets where only the first packet has is_first_packet_in_frame set. The previous code assumed that all StapA had is_first_packet_in_frame = true. Per discussion on the attached bug, removing the DCHECK is OK.

Bug: webrtc:15155
Change-Id: I6348740eac7d70bca2b7541721aaa7e2b5e5a970
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/316941
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40608}
This commit is contained in:
Joachim Reiersen 2023-08-18 11:15:37 -07:00 committed by WebRTC LUCI CQ
parent 8d4a5f1122
commit c08df4bdca
2 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/video_coding/h264_sps_pps_tracker.cc
View file

@ -130,7 +130,6 @@ H264SpsPpsTracker::FixedBitstream H264SpsPpsTracker::CopyAndFixBitstream(
if (h264_header.packetization_type == kH264StapA) { if (h264_header.packetization_type == kH264StapA) {
const uint8_t* nalu_ptr = bitstream.data() + 1; const uint8_t* nalu_ptr = bitstream.data() + 1;
while (nalu_ptr < bitstream.data() + bitstream.size() - 1) { while (nalu_ptr < bitstream.data() + bitstream.size() - 1) {
RTC_DCHECK(video_header->is_first_packet_in_frame);
required_size += sizeof(start_code_h264); required_size += sizeof(start_code_h264);
// The first two bytes describe the length of a segment. // The first two bytes describe the length of a segment.

42
modules/video_coding/h264_sps_pps_tracker_unittest.cc
View file

@ -156,6 +156,48 @@ TEST_F(TestH264SpsPpsTracker, StapAIncorrectSegmentLength) {
H264SpsPpsTracker::kDrop); H264SpsPpsTracker::kDrop);
} }
TEST_F(TestH264SpsPpsTracker, ConsecutiveStapA) {
// When the GenericFrameDescriptor or DependencyDescriptor RTP header
// extensions are used, we may receive a series of StapA packets where only
// the first packet has is_first_packet_in_frame = true set.
std::vector<uint8_t> data;
H264VideoHeader first_header;
first_header.h264().packetization_type = kH264StapA;
first_header.is_first_packet_in_frame = true;
// SPS in first packet.
data.insert(data.end(), {0}); // First byte is ignored
data.insert(data.end(), {0, 2}); // Length of segment
AddSps(&first_header, 13, &data);
H264SpsPpsTracker::FixedBitstream first_fixed =
tracker_.CopyAndFixBitstream(data, &first_header);
EXPECT_THAT(first_fixed.action, H264SpsPpsTracker::kInsert);
H264VideoHeader second_header;
second_header.h264().packetization_type = kH264StapA;
second_header.is_first_packet_in_frame = false;
// PPS and IDR in second packet.
data.insert(data.end(), {0, 2}); // Length of segment
AddPps(&second_header, 13, 27, &data);
data.insert(data.end(), {0, 5}); // Length of segment
AddIdr(&second_header, 27);
data.insert(data.end(), {1, 2, 3, 2, 1});
H264SpsPpsTracker::FixedBitstream fixed =
tracker_.CopyAndFixBitstream(data, &second_header);
EXPECT_THAT(fixed.action, H264SpsPpsTracker::kInsert);
std::vector<uint8_t> expected;
expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
expected.insert(expected.end(), {H264::NaluType::kSps, 13});
expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
expected.insert(expected.end(), {H264::NaluType::kPps, 27});
expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
expected.insert(expected.end(), {1, 2, 3, 2, 1});
EXPECT_THAT(Bitstream(fixed), ElementsAreArray(expected));
}
TEST_F(TestH264SpsPpsTracker, SingleNaluInsertStartCode) { TEST_F(TestH264SpsPpsTracker, SingleNaluInsertStartCode) {
uint8_t data[] = {1, 2, 3}; uint8_t data[] = {1, 2, 3};
H264VideoHeader header; H264VideoHeader header;