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

webrtc/video/video_capture_input_unittest.cc

 /*
  *  Copyright (c) 2014 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.
  */
 #include "webrtc/video/video_capture_input.h"
@@ skipping 36 matching lines @@
   void AddInputFrame(VideoFrame* frame) {
     input_->IncomingCapturedFrame(*frame);
   }
 
   void WaitOutputFrame() {
     EXPECT_TRUE(capture_event_.Wait(FRAME_TIMEOUT_MS));
     VideoFrame frame;
     EXPECT_TRUE(input_->GetVideoFrame(&frame));
     ASSERT_TRUE(frame.video_frame_buffer());
     if (!frame.video_frame_buffer()->native_handle()) {
-      output_frame_ybuffers_.push_back(
-          static_cast<const VideoFrame*>(&frame)->buffer(kYPlane));
+      output_frame_ybuffers_.push_back(frame.video_frame_buffer()->DataY());
     }
     output_frames_.push_back(
         std::unique_ptr<VideoFrame>(new VideoFrame(frame)));
   }
 
   SendStatisticsProxy stats_proxy_;
 
   rtc::Event capture_event_;
 
   std::unique_ptr<OveruseFrameDetector> overuse_detector_;
@@ skipping 105 matching lines @@
   }
 
   EXPECT_TRUE(EqualFramesVector(input_frames_, output_frames_));
 }
 
 TEST_F(VideoCaptureInputTest, TestI420Frames) {
   const int kNumFrame = 4;
   std::vector<const uint8_t*> ybuffer_pointers;
   for (int i = 0; i < kNumFrame; ++i) {
     input_frames_.push_back(CreateVideoFrame(static_cast<uint8_t>(i + 1)));
-    const VideoFrame* const_input_frame = input_frames_[i].get();
-    ybuffer_pointers.push_back(const_input_frame->buffer(kYPlane));
+    ybuffer_pointers.push_back(input_frames_[i]->video_frame_buffer()->DataY());
     AddInputFrame(input_frames_[i].get());
     WaitOutputFrame();
   }
 
   EXPECT_TRUE(EqualFramesVector(input_frames_, output_frames_));
   // Make sure the buffer is not copied.
   for (int i = 0; i < kNumFrame; ++i)
     EXPECT_EQ(ybuffer_pointers[i], output_frame_ybuffers_[i]);
 }
 
@@ skipping 52 matching lines @@
   const int kSizeY = width * height * 2;
   uint8_t buffer[kSizeY];
   memset(buffer, data, kSizeY);
   frame->CreateFrame(buffer, buffer, buffer, width, height, width, width / 2,
                      width / 2, kVideoRotation_0);
   frame->set_render_time_ms(data);
   return frame;
 }
 
 }  // namespace webrtc