Revert of Delete unused and almost unused frame-related methods.

webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 105 matching lines @@
   int ret = av_image_check_size(static_cast<unsigned int>(width),
                                 static_cast<unsigned int>(height), 0, nullptr);
   if (ret < 0) {
     LOG(LS_ERROR) << "Invalid picture size " << width << "x" << height;
     decoder->ReportError();
     return ret;
   }
 
   // The video frame is stored in |video_frame|. |av_frame| is FFmpeg's version
   // of a video frame and will be set up to reference |video_frame|'s buffers.
-
-  // TODO(nisse): The VideoFrame's timestamp and rotation info is not used.
-  // Refactor to do not use a VideoFrame object at all.
-
+  VideoFrame* video_frame = new VideoFrame();
   // FFmpeg expects the initial allocation to be zero-initialized according to
   // http://crbug.com/390941. Our pool is set up to zero-initialize new buffers.
-  VideoFrame* video_frame = new VideoFrame(
-      decoder->pool_.CreateBuffer(width, height),
-      0 /* timestamp */, 0 /* render_time_ms */, kVideoRotation_0);
-
+  video_frame->set_video_frame_buffer(
+      decoder->pool_.CreateBuffer(width, height));
   // DCHECK that we have a continuous buffer as is required.
   RTC_DCHECK_EQ(video_frame->video_frame_buffer()->DataU(),
                 video_frame->video_frame_buffer()->DataY() +
                 video_frame->allocated_size(kYPlane));
   RTC_DCHECK_EQ(video_frame->video_frame_buffer()->DataV(),
                 video_frame->video_frame_buffer()->DataU() +
                 video_frame->allocated_size(kUPlane));
   int total_size = video_frame->allocated_size(kYPlane) +
                    video_frame->allocated_size(kUPlane) +
                    video_frame->allocated_size(kVPlane);
@@ skipping 207 matching lines @@
       av_buffer_get_opaque(av_frame_->buf[0]));
   RTC_DCHECK(video_frame);
   RTC_CHECK_EQ(av_frame_->data[kYPlane],
                video_frame->video_frame_buffer()->DataY());
   RTC_CHECK_EQ(av_frame_->data[kUPlane],
                video_frame->video_frame_buffer()->DataU());
   RTC_CHECK_EQ(av_frame_->data[kVPlane],
                video_frame->video_frame_buffer()->DataV());
   video_frame->set_timestamp(input_image._timeStamp);
 
-  int32_t ret;
-
   // The decoded image may be larger than what is supposed to be visible, see
   // |AVGetBuffer2|'s use of |avcodec_align_dimensions|. This crops the image
   // without copying the underlying buffer.
   rtc::scoped_refptr<VideoFrameBuffer> buf = video_frame->video_frame_buffer();
   if (av_frame_->width != buf->width() || av_frame_->height != buf->height()) {
-    rtc::scoped_refptr<VideoFrameBuffer> cropped_buf(
+    video_frame->set_video_frame_buffer(
         new rtc::RefCountedObject<WrappedI420Buffer>(
             av_frame_->width, av_frame_->height,
             buf->DataY(), buf->StrideY(),
             buf->DataU(), buf->StrideU(),
             buf->DataV(), buf->StrideV(),
             rtc::KeepRefUntilDone(buf)));
-    VideoFrame cropped_frame(
-        cropped_buf, video_frame->timestamp(), video_frame->render_time_ms(),
-        video_frame->rotation());
-    // TODO(nisse): Timestamp and rotation are all zero here. Change decoder
-    // interface to pass a VideoFrameBuffer instead of a VideoFrame?
-    ret = decoded_image_callback_->Decoded(cropped_frame);
-  } else {
-    // Return decoded frame.
-    ret = decoded_image_callback_->Decoded(*video_frame);
   }
+
+  // Return decoded frame.
+  int32_t ret = decoded_image_callback_->Decoded(*video_frame);
   // Stop referencing it, possibly freeing |video_frame|.
   av_frame_unref(av_frame_.get());
   video_frame = nullptr;
 
   if (ret) {
     LOG(LS_WARNING) << "DecodedImageCallback::Decoded returned " << ret;
     return ret;
   }
   return WEBRTC_VIDEO_CODEC_OK;
 }
@@ skipping 14 matching lines @@
 void H264DecoderImpl::ReportError() {
   if (has_reported_error_)
     return;
   RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
                             kH264DecoderEventError,
                             kH264DecoderEventMax);
   has_reported_error_ = true;
 }
 
 }  // namespace webrtc