Reland of Delete webrtc::VideoFrame methods buffer and stride.

webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

 /*
  *  Copyright (c) 2012 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 734 matching lines @@
   // Since we are extracting raw pointers from |input_image| to
   // |raw_images_[0]|, the resolution of these frames must match. Note that
   // |input_image| might be scaled from |frame|. In that case, the resolution of
   // |raw_images_[0]| should have been updated in UpdateCodecFrameSize.
   RTC_DCHECK_EQ(input_image.width(), static_cast<int>(raw_images_[0].d_w));
   RTC_DCHECK_EQ(input_image.height(), static_cast<int>(raw_images_[0].d_h));
 
   // Image in vpx_image_t format.
   // Input image is const. VP8's raw image is not defined as const.
   raw_images_[0].planes[VPX_PLANE_Y] =
-      const_cast<uint8_t*>(input_image.buffer(kYPlane));
+      const_cast<uint8_t*>(input_image.video_frame_buffer()->DataY());
   raw_images_[0].planes[VPX_PLANE_U] =
-      const_cast<uint8_t*>(input_image.buffer(kUPlane));
+      const_cast<uint8_t*>(input_image.video_frame_buffer()->DataU());
   raw_images_[0].planes[VPX_PLANE_V] =
-      const_cast<uint8_t*>(input_image.buffer(kVPlane));
+      const_cast<uint8_t*>(input_image.video_frame_buffer()->DataV());
 
-  raw_images_[0].stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
-  raw_images_[0].stride[VPX_PLANE_U] = input_image.stride(kUPlane);
-  raw_images_[0].stride[VPX_PLANE_V] = input_image.stride(kVPlane);
+  raw_images_[0].stride[VPX_PLANE_Y] =
+      input_image.video_frame_buffer()->StrideY();
+  raw_images_[0].stride[VPX_PLANE_U] =
+      input_image.video_frame_buffer()->StrideU();
+  raw_images_[0].stride[VPX_PLANE_V] =
+      input_image.video_frame_buffer()->StrideV();
 
   for (size_t i = 1; i < encoders_.size(); ++i) {
     // Scale the image down a number of times by downsampling factor
     libyuv::I420Scale(
         raw_images_[i - 1].planes[VPX_PLANE_Y],
         raw_images_[i - 1].stride[VPX_PLANE_Y],
         raw_images_[i - 1].planes[VPX_PLANE_U],
         raw_images_[i - 1].stride[VPX_PLANE_U],
         raw_images_[i - 1].planes[VPX_PLANE_V],
         raw_images_[i - 1].stride[VPX_PLANE_V], raw_images_[i - 1].d_w,
@@ skipping 576 matching lines @@
     return WEBRTC_VIDEO_CODEC_NO_OUTPUT;
   }
   last_frame_width_ = img->d_w;
   last_frame_height_ = img->d_h;
   // Allocate memory for decoded image.
   VideoFrame decoded_image(buffer_pool_.CreateBuffer(img->d_w, img->d_h),
                            timestamp, 0, kVideoRotation_0);
   libyuv::I420Copy(img->planes[VPX_PLANE_Y], img->stride[VPX_PLANE_Y],
                    img->planes[VPX_PLANE_U], img->stride[VPX_PLANE_U],
                    img->planes[VPX_PLANE_V], img->stride[VPX_PLANE_V],
-                   decoded_image.buffer(kYPlane), decoded_image.stride(kYPlane),
-                   decoded_image.buffer(kUPlane), decoded_image.stride(kUPlane),
-                   decoded_image.buffer(kVPlane), decoded_image.stride(kVPlane),
+                   decoded_image.video_frame_buffer()->MutableDataY(),
+                   decoded_image.video_frame_buffer()->StrideY(),
+                   decoded_image.video_frame_buffer()->MutableDataU(),
+                   decoded_image.video_frame_buffer()->StrideU(),
+                   decoded_image.video_frame_buffer()->MutableDataV(),
+                   decoded_image.video_frame_buffer()->StrideV(),
                    img->d_w, img->d_h);
   decoded_image.set_ntp_time_ms(ntp_time_ms);
   int ret = decode_complete_callback_->Decoded(decoded_image);
   if (ret != 0)
     return ret;
 
   // Remember image format for later
   image_format_ = img->fmt;
   return WEBRTC_VIDEO_CODEC_OK;
 }
@@ skipping 38 matching lines @@
     return -1;
   }
   if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) !=
       VPX_CODEC_OK) {
     return -1;
   }
   return 0;
 }
 
 }  // namespace webrtc