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

webrtc/test/frame_generator.cc

 /*
  *  Copyright (c) 2013 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/test/frame_generator.h"
@@ skipping 23 matching lines @@
   VideoFrame* NextFrame() override {
     frame_.CreateEmptyFrame(static_cast<int>(width_),
                             static_cast<int>(height_),
                             static_cast<int>(width_),
                             static_cast<int>((width_ + 1) / 2),
                             static_cast<int>((width_ + 1) / 2));
     angle_ += 30.0;
     uint8_t u = fabs(sin(angle_)) * 0xFF;
     uint8_t v = fabs(cos(angle_)) * 0xFF;
 
-    memset(frame_.buffer(kYPlane), 0x80, frame_.allocated_size(kYPlane));
-    memset(frame_.buffer(kUPlane), u, frame_.allocated_size(kUPlane));
-    memset(frame_.buffer(kVPlane), v, frame_.allocated_size(kVPlane));
+    memset(frame_.video_frame_buffer()->MutableDataY(), 0x80,
+           frame_.allocated_size(kYPlane));
+    memset(frame_.video_frame_buffer()->MutableDataU(), u,
+           frame_.allocated_size(kUPlane));
+    memset(frame_.video_frame_buffer()->MutableDataV(), v,
+           frame_.allocated_size(kVPlane));
     return &frame_;
   }
 
  private:
   double angle_;
   size_t width_;
   size_t height_;
   VideoFrame frame_;
 };
 
@@ skipping 138 matching lines @@
   void CropSourceToScrolledImage(double scroll_factor) {
     const int kTargetWidth = current_frame_.width();
     const int kTargetHeight = current_frame_.height();
     int scroll_margin_x = current_source_frame_->width() - kTargetWidth;
     int pixels_scrolled_x =
         static_cast<int>(scroll_margin_x * scroll_factor + 0.5);
     int scroll_margin_y = current_source_frame_->height() - kTargetHeight;
     int pixels_scrolled_y =
         static_cast<int>(scroll_margin_y * scroll_factor + 0.5);
 
-    int offset_y = (current_source_frame_->stride(PlaneType::kYPlane) *
+    int offset_y = (current_source_frame_->video_frame_buffer()->StrideY() *
                     pixels_scrolled_y) +
                    pixels_scrolled_x;
-    int offset_u = (current_source_frame_->stride(PlaneType::kUPlane) *
+    int offset_u = (current_source_frame_->video_frame_buffer()->StrideU() *
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
-    int offset_v = (current_source_frame_->stride(PlaneType::kVPlane) *
+    int offset_v = (current_source_frame_->video_frame_buffer()->StrideV() *
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
 
     current_frame_.CreateFrame(
-        &current_source_frame_->buffer(PlaneType::kYPlane)[offset_y],
-        &current_source_frame_->buffer(PlaneType::kUPlane)[offset_u],
-        &current_source_frame_->buffer(PlaneType::kVPlane)[offset_v],
+        &current_source_frame_->video_frame_buffer()->DataY()[offset_y],
+        &current_source_frame_->video_frame_buffer()->DataU()[offset_u],
+        &current_source_frame_->video_frame_buffer()->DataV()[offset_v],
         kTargetWidth, kTargetHeight,
-        current_source_frame_->stride(PlaneType::kYPlane),
-        current_source_frame_->stride(PlaneType::kUPlane),
-        current_source_frame_->stride(PlaneType::kVPlane),
+        current_source_frame_->video_frame_buffer()->StrideY(),
+        current_source_frame_->video_frame_buffer()->StrideU(),
+        current_source_frame_->video_frame_buffer()->StrideV(),
         kVideoRotation_0);
   }
 
   Clock* const clock_;
   const int64_t start_time_;
   const int64_t scroll_time_;
   const int64_t pause_time_;
   const size_t num_frames_;
   size_t current_frame_num_;
   VideoFrame* current_source_frame_;
@@ skipping 41 matching lines @@
     files.push_back(file);
   }
 
   return new ScrollingImageFrameGenerator(
       clock, files, source_width, source_height, target_width, target_height,
       scroll_time_ms, pause_time_ms);
 }
 
 }  // namespace test
 }  // namespace webrtc