| Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
|
| index 41fd7ff3845a8eb91f48fda76f322280f6f1d0dc..99d0b7ace86f1e6b9dfa6315d97f56d5b4b10f23 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
|
| @@ -145,7 +145,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);
|
| @@ -335,7 +334,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);
|
| @@ -362,7 +360,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<uint16_t>(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;
|
| @@ -807,9 +804,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;
|
|
|