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

webrtc/modules/video_processing/video_denoiser.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 63 matching lines @@
       filter_(DenoiserFilter::Create(runtime_cpu_detection, &cpu_type_)),
       ne_(new NoiseEstimation()) {}
 
 void VideoDenoiser::DenoiserReset(const VideoFrame& frame,
                                   VideoFrame* denoised_frame,
                                   VideoFrame* denoised_frame_prev) {
   width_ = frame.width();
   height_ = frame.height();
   mb_cols_ = width_ >> 4;
   mb_rows_ = height_ >> 4;
-  stride_y_ = frame.stride(kYPlane);
-  stride_u_ = frame.stride(kUPlane);
-  stride_v_ = frame.stride(kVPlane);
+  stride_y_ = frame.video_frame_buffer()->StrideY();
+  stride_u_ = frame.video_frame_buffer()->StrideU();
+  stride_v_ = frame.video_frame_buffer()->StrideV();
 
   // Allocate an empty buffer for denoised_frame_prev.
   denoised_frame_prev->CreateEmptyFrame(width_, height_, stride_y_, stride_u_,
                                         stride_v_);
   // Allocate and initialize denoised_frame with key frame.
-  denoised_frame->CreateFrame(frame.buffer(kYPlane), frame.buffer(kUPlane),
-                              frame.buffer(kVPlane), width_, height_, stride_y_,
-                              stride_u_, stride_v_, kVideoRotation_0);
+  denoised_frame->CreateFrame(
+      frame.video_frame_buffer()->DataY(),
+      frame.video_frame_buffer()->DataU(),
+      frame.video_frame_buffer()->DataV(),
+      width_, height_, stride_y_, stride_u_, stride_v_, kVideoRotation_0);
   // Set time parameters to the output frame.
   denoised_frame->set_timestamp(frame.timestamp());
   denoised_frame->set_render_time_ms(frame.render_time_ms());
 
   // Init noise estimator and allocate buffers.
   ne_->Init(width_, height_, cpu_type_);
   moving_edge_.reset(new uint8_t[mb_cols_ * mb_rows_]);
   mb_filter_decision_.reset(new DenoiserDecision[mb_cols_ * mb_rows_]);
   x_density_.reset(new uint8_t[mb_cols_]);
   y_density_.reset(new uint8_t[mb_rows_]);
@@ skipping 124 matching lines @@
                                  VideoFrame* denoised_frame_prev,
                                  bool noise_estimation_enabled) {
   // If previous width and height are different from current frame's, need to
   // reallocate the buffers and no denoising for the current frame.
   if (width_ != frame.width() || height_ != frame.height()) {
     DenoiserReset(frame, denoised_frame, denoised_frame_prev);
     return;
   }
 
   // Set buffer pointers.
-  const uint8_t* y_src = frame.buffer(kYPlane);
-  const uint8_t* u_src = frame.buffer(kUPlane);
-  const uint8_t* v_src = frame.buffer(kVPlane);
-  uint8_t* y_dst = denoised_frame->buffer(kYPlane);
-  uint8_t* u_dst = denoised_frame->buffer(kUPlane);
-  uint8_t* v_dst = denoised_frame->buffer(kVPlane);
-  uint8_t* y_dst_prev = denoised_frame_prev->buffer(kYPlane);
+  const uint8_t* y_src = frame.video_frame_buffer()->DataY();
+  const uint8_t* u_src = frame.video_frame_buffer()->DataU();
+  const uint8_t* v_src = frame.video_frame_buffer()->DataV();
+  uint8_t* y_dst = denoised_frame->video_frame_buffer()->MutableDataY();
+  uint8_t* u_dst = denoised_frame->video_frame_buffer()->MutableDataU();
+  uint8_t* v_dst = denoised_frame->video_frame_buffer()->MutableDataV();
+  uint8_t* y_dst_prev =
+      denoised_frame_prev->video_frame_buffer()->MutableDataY();
   memset(x_density_.get(), 0, mb_cols_);
   memset(y_density_.get(), 0, mb_rows_);
   memset(moving_object_.get(), 1, mb_cols_ * mb_rows_);
 
   uint8_t noise_level = noise_estimation_enabled ? ne_->GetNoiseLevel() : 0;
   int thr_var_base = 16 * 16 * 2;
   // Loop over blocks to accumulate/extract noise level and update x/y_density
   // factors for moving object detection.
   for (int mb_row = 0; mb_row < mb_rows_; ++mb_row) {
     const int mb_index_base = mb_row * mb_cols_;
@@ skipping 85 matching lines @@
   denoised_frame->set_render_time_ms(frame.render_time_ms());
 
 #if DISPLAY || DISPLAYNEON
   // Show rectangular region
   ShowRect(filter_, moving_edge_, moving_object_, x_density_, y_density_, u_src,
            v_src, u_dst, v_dst, mb_rows_, mb_cols_, stride_u_, stride_v_);
 #endif
 }
 
 }  // namespace webrtc