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

webrtc/test/frame_generator_unittest.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 41 matching lines @@
     fwrite(plane_buffer.get(), 1, y_size, file);
     memset(plane_buffer.get(), u, uv_size);
     fwrite(plane_buffer.get(), 1, uv_size, file);
     memset(plane_buffer.get(), v, uv_size);
     fwrite(plane_buffer.get(), 1, uv_size, file);
   }
 
   void CheckFrameAndMutate(VideoFrame* frame, uint8_t y, uint8_t u, uint8_t v) {
     // Check that frame is valid, has the correct color and timestamp are clean.
     ASSERT_NE(nullptr, frame);
-    uint8_t* buffer;
+    const uint8_t* buffer;
     ASSERT_EQ(y_size, frame->allocated_size(PlaneType::kYPlane));
-    buffer = frame->buffer(PlaneType::kYPlane);
+    buffer = frame->video_frame_buffer()->DataY();
     for (int i = 0; i < y_size; ++i)
       ASSERT_EQ(y, buffer[i]);
     ASSERT_EQ(uv_size, frame->allocated_size(PlaneType::kUPlane));
-    buffer = frame->buffer(PlaneType::kUPlane);
+    buffer = frame->video_frame_buffer()->DataU();
     for (int i = 0; i < uv_size; ++i)
       ASSERT_EQ(u, buffer[i]);
     ASSERT_EQ(uv_size, frame->allocated_size(PlaneType::kVPlane));
-    buffer = frame->buffer(PlaneType::kVPlane);
+    buffer = frame->video_frame_buffer()->DataV();
     for (int i = 0; i < uv_size; ++i)
       ASSERT_EQ(v, buffer[i]);
     EXPECT_EQ(0, frame->ntp_time_ms());
     EXPECT_EQ(0, frame->render_time_ms());
     EXPECT_EQ(0u, frame->timestamp());
 
     // Mutate to something arbitrary non-zero.
     frame->set_ntp_time_ms(11);
     frame->set_render_time_ms(12);
     frame->set_timestamp(13);
@@ skipping 58 matching lines @@
     CheckFrameAndMutate(generator->NextFrame(), 0, 0, 0);
   for (int i = 0; i < kRepeatCount; ++i)
     CheckFrameAndMutate(generator->NextFrame(), 127, 127, 127);
   for (int i = 0; i < kRepeatCount; ++i)
     CheckFrameAndMutate(generator->NextFrame(), 255, 255, 255);
   CheckFrameAndMutate(generator->NextFrame(), 0, 0, 0);
 }
 
 }  // namespace test
 }  // namespace webrtc