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

Insert startcodes for H264 single NALU packets.

Browse Source 
Bug: none
Change-Id: I68ee9b84d75b67044d28a47fe740c79a2cd33517
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142169
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28287}
This commit is contained in:
philipel
2019-06-14 13:40:04 +02:00
committed by Commit Bot
parent 856ca198e2
commit 5e953d7968
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/video_coding/h264_sps_pps_tracker.cc
View File

@ -140,8 +140,10 @@ H264SpsPpsTracker::PacketAction H264SpsPpsTracker::CopyAndFixBitstream(
nalu_ptr += segment_length;
}
} else {
if (video_header.is_first_packet_in_frame)
if (video_header.is_first_packet_in_frame ||
h264_header.packetization_type == kH264SingleNalu) {
required_size += sizeof(start_code_h264);
}
required_size += data_size;
}
@ -202,7 +204,8 @@ H264SpsPpsTracker::PacketAction H264SpsPpsTracker::CopyAndFixBitstream(
nalu_ptr += segment_length;
}
} else {
if (video_header.is_first_packet_in_frame) {
if (video_header.is_first_packet_in_frame ||
h264_header.packetization_type == kH264SingleNalu) {
memcpy(insert_at, start_code_h264, sizeof(start_code_h264));
insert_at += sizeof(start_code_h264);
}

3
modules/video_coding/h264_sps_pps_tracker_unittest.cc
View File

@ -149,10 +149,9 @@ TEST_F(TestH264SpsPpsTracker, StapAIncorrectSegmentLength) {
EXPECT_EQ(H264SpsPpsTracker::kDrop, tracker_.CopyAndFixBitstream(&packet));
}
TEST_F(TestH264SpsPpsTracker, NoNalusFirstPacket) {
TEST_F(TestH264SpsPpsTracker, SingleNaluInsertStartCode) {
uint8_t data[] = {1, 2, 3};
H264VcmPacket packet;
packet.video_header.is_first_packet_in_frame = true;
packet.dataPtr = data;
packet.sizeBytes = sizeof(data);