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

Allocate separate component buffers in MultiplexEncodedImagePacker::Unpack

Browse Source 
This eliminates use of EncodedImage::set_buffer.

Bug: webrtc:9378
Change-Id: Iea19f063b7cc4d7a6184efe6cd22ce829db524b3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128762
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Emircan Uysaler <emircan@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27303}
This commit is contained in:
Niels Möller
2019-03-21 15:16:29 +01:00
committed by Commit Bot
parent b9bb3718e3
commit 712fb89ca8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,11 +263,11 @@ MultiplexImage MultiplexEncodedImagePacker::Unpack(
EncodedImage encoded_image = combined_image;
encoded_image.SetTimestamp(combined_image.Timestamp());
encoded_image._frameType = frame_headers[i].frame_type;
encoded_image.set_buffer(
combined_image.mutable_data() + frame_headers[i].bitstream_offset,
static_cast<size_t>(frame_headers[i].bitstream_length));
encoded_image.set_size(encoded_image.capacity());
encoded_image.Allocate(frame_headers[i].bitstream_length);
encoded_image.set_size(frame_headers[i].bitstream_length);
memcpy(encoded_image.data(),
combined_image.data() + frame_headers[i].bitstream_offset,
frame_headers[i].bitstream_length);
image_component.encoded_image = encoded_image;