From e703f4133650ad9c17dc9d3e655608d1ec1eaffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Susano=20Pinto?= Date: Fri, 1 Jul 2016 13:36:10 +0200 Subject: [PATCH] Remove unused copy of last received keyframe. Copy method was the user of those fields but it has been removed in May 2015 by refs/heads/master@{#9244}. R=pbos@webrtc.org Review URL: https://codereview.webrtc.org/2113973002 . Cr-Commit-Position: refs/heads/master@{#13362} --- .../video_coding/codecs/vp8/vp8_impl.cc | 28 ------------------- .../video_coding/codecs/vp8/vp8_impl.h | 1 - 2 files changed, 29 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 9834ddcc7b..179081ae33 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -1099,7 +1099,6 @@ VP8DecoderImpl::VP8DecoderImpl() inited_(false), feedback_mode_(false), decoder_(NULL), - last_keyframe_(), image_format_(VPX_IMG_FMT_NONE), ref_frame_(NULL), propagation_cnt_(-1), @@ -1259,29 +1258,6 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image, } #endif - // Store encoded frame if key frame. (Used in Copy method.) - if (input_image._frameType == kVideoFrameKey && input_image._buffer != NULL) { - const uint32_t bytes_to_copy = input_image._length; - if (last_keyframe_._size < bytes_to_copy) { - delete[] last_keyframe_._buffer; - last_keyframe_._buffer = NULL; - last_keyframe_._size = 0; - } - uint8_t* temp_buffer = last_keyframe_._buffer; // Save buffer ptr. - uint32_t temp_size = last_keyframe_._size; // Save size. - last_keyframe_ = input_image; // Shallow copy. - last_keyframe_._buffer = temp_buffer; // Restore buffer ptr. - last_keyframe_._size = temp_size; // Restore buffer size. - if (!last_keyframe_._buffer) { - // Allocate memory. - last_keyframe_._size = bytes_to_copy; - last_keyframe_._buffer = new uint8_t[last_keyframe_._size]; - } - // Copy encoded frame. - memcpy(last_keyframe_._buffer, input_image._buffer, bytes_to_copy); - last_keyframe_._length = bytes_to_copy; - } - img = vpx_codec_get_frame(decoder_, &iter); ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_); if (ret != 0) { @@ -1399,10 +1375,6 @@ int VP8DecoderImpl::RegisterDecodeCompleteCallback( } int VP8DecoderImpl::Release() { - if (last_keyframe_._buffer != NULL) { - delete[] last_keyframe_._buffer; - last_keyframe_._buffer = NULL; - } if (decoder_ != NULL) { if (vpx_codec_destroy(decoder_)) { return WEBRTC_VIDEO_CODEC_MEMORY; diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h index a9079b2a7f..ff47caafaa 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h @@ -158,7 +158,6 @@ class VP8DecoderImpl : public VP8Decoder { bool feedback_mode_; vpx_codec_ctx_t* decoder_; VideoCodec codec_; - EncodedImage last_keyframe_; int image_format_; vpx_ref_frame_t* ref_frame_; int propagation_cnt_;