From 69bb3afd53d8a32c1678ec8ed484d3f7e6b132d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 13 Feb 2019 10:05:49 +0100 Subject: [PATCH] Update EncodedFrameForMediaTransport to use Retain() rather than set_buffer + memcpy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9378 Change-Id: I7f0d0f57bc38ecb25dd7de873c7c96a944ffb307 Reviewed-on: https://webrtc-review.googlesource.com/c/122781 Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#26665} --- video/video_receive_stream.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 92f15713e2..c92a349a90 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -130,14 +130,8 @@ class EncodedFrameForMediaTransport : public video_coding::EncodedFrame { // buffer, in which case we need to make an owned copy. *static_cast(this) = frame.encoded_image(); - if (buffer()) { - // Unowned data. Make a copy we own. - set_buffer(nullptr, 0); - - VerifyAndAllocate(frame.encoded_image().size()); - set_size(frame.encoded_image().size()); - memcpy(data(), frame.encoded_image().data(), size()); - } + // If we don't already own the buffer, make a copy. + Retain(); _payloadType = static_cast(frame.payload_type());