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

Delete EncodedImage::GetBufferPaddingBytes

Browse Source 
For the ffmpeg H.264 decoder, rely on ffmpeg being configured with
CONFIG_SAFE_BITSTREAM_READER.

Bug: webrtc:9378
Change-Id: Ia7a46580d520808e36581252a95feeb5f9c57bf9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/119665
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27124}
This commit is contained in:
Niels Möller
2019-03-08 11:26:58 +01:00
committed by Commit Bot
parent 1f4173e420
commit 009ab3c438
9 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc
View File

@ -169,10 +169,8 @@ EncodedImage MultiplexEncodedImagePacker::PackAndRelease(
frame_header.component_index = images[i].component_index;
frame_header.bitstream_offset = bitstream_offset;
const size_t padding =
EncodedImage::GetBufferPaddingBytes(images[i].codec_type);
frame_header.bitstream_length =
static_cast<uint32_t>(images[i].encoded_image.size() + padding);
static_cast<uint32_t>(images[i].encoded_image.size());
bitstream_offset += frame_header.bitstream_length;
frame_header.codec_type = images[i].codec_type;
@ -267,9 +265,8 @@ MultiplexImage MultiplexEncodedImagePacker::Unpack(
encoded_image.set_buffer(
combined_image.mutable_data() + frame_headers[i].bitstream_offset,
static_cast<size_t>(frame_headers[i].bitstream_length));
const size_t padding =
EncodedImage::GetBufferPaddingBytes(image_component.codec_type);
encoded_image.set_size(encoded_image.capacity() - padding);
encoded_image.set_size(encoded_image.capacity());
image_component.encoded_image = encoded_image;