From c50105db356d38d219c06e258b72bb708cf7d991 Mon Sep 17 00:00:00 2001 From: pbos Date: Tue, 2 May 2017 06:36:33 -0700 Subject: [PATCH] Remove unused 'last_key_frame_picture_id' field. BUG=webrtc:7349 R=brandtr@webrtc.org Review-Url: https://codereview.webrtc.org/2813763002 Cr-Commit-Position: refs/heads/master@{#17976} --- webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | 6 ------ webrtc/modules/video_coding/codecs/vp8/vp8_impl.h | 1 - 2 files changed, 7 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 3935c96b27..9872766dae 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -169,7 +169,6 @@ VP8EncoderImpl::VP8EncoderImpl() srand(seed); picture_id_.reserve(kMaxSimulcastStreams); - last_key_frame_picture_id_.reserve(kMaxSimulcastStreams); temporal_layers_.reserve(kMaxSimulcastStreams); raw_images_.reserve(kMaxSimulcastStreams); encoded_images_.reserve(kMaxSimulcastStreams); @@ -359,7 +358,6 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, } picture_id_.resize(number_of_streams); - last_key_frame_picture_id_.resize(number_of_streams); encoded_images_.resize(number_of_streams); encoders_.resize(number_of_streams); configurations_.resize(number_of_streams); @@ -386,7 +384,6 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, for (int i = 0; i < number_of_streams; ++i) { // Random start, 16 bits is enough. picture_id_[i] = static_cast(rand()) & 0x7FFF; // NOLINT - last_key_frame_picture_id_[i] = -1; // allocate memory for encoded image if (encoded_images_[i]._buffer != NULL) { delete[] encoded_images_[i]._buffer; @@ -803,9 +800,6 @@ void VP8EncoderImpl::PopulateCodecSpecific( codec_specific->codec_name = ImplementationName(); CodecSpecificInfoVP8* vp8Info = &(codec_specific->codecSpecific.VP8); vp8Info->pictureId = picture_id_[stream_idx]; - if (pkt.data.frame.flags & VPX_FRAME_IS_KEY) { - last_key_frame_picture_id_[stream_idx] = picture_id_[stream_idx]; - } vp8Info->simulcastIdx = stream_idx; vp8Info->keyIdx = kNoKeyIdx; // TODO(hlundin) populate this vp8Info->nonReference = (pkt.data.frame.flags & VPX_FRAME_IS_DROPPABLE) != 0; diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h index f07b0f9399..961c361150 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h @@ -102,7 +102,6 @@ class VP8EncoderImpl : public VP8Encoder { uint32_t rc_max_intra_target_; std::vector temporal_layers_; std::vector picture_id_; - std::vector last_key_frame_picture_id_; std::vector key_frame_request_; std::vector send_stream_; std::vector cpu_speed_;