From 712fb89ca86ba429ae76540c69a3617f67a504cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 21 Mar 2019 15:16:29 +0100 Subject: [PATCH] Allocate separate component buffers in MultiplexEncodedImagePacker::Unpack 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 Reviewed-by: Emircan Uysaler Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#27303} --- .../codecs/multiplex/multiplex_encoded_image_packer.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc index 5e4a97f87e..b36ac32c5c 100644 --- a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc +++ b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc @@ -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(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;