Refactor VideoDenoiser to work with I420Buffer, not VideoFrame.

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 56 matching lines @@
   }
 }
 #endif
 
 VideoDenoiser::VideoDenoiser(bool runtime_cpu_detection)
     : width_(0),
       height_(0),
       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();
+void VideoDenoiser::DenoiserReset(
+    const rtc::scoped_refptr<VideoFrameBuffer>& frame,
+    rtc::scoped_refptr<I420Buffer>* denoised_frame,
+    rtc::scoped_refptr<I420Buffer>* denoised_frame_prev) {
+  width_ = frame->width();
+  height_ = frame->height();
   mb_cols_ = width_ >> 4;
   mb_rows_ = height_ >> 4;
-  stride_y_ = frame.video_frame_buffer()->StrideY();
-  stride_u_ = frame.video_frame_buffer()->StrideU();
-  stride_v_ = frame.video_frame_buffer()->StrideV();
+  stride_y_ = frame->StrideY();
+  stride_u_ = frame->StrideU();
+  stride_v_ = frame->StrideV();
 
   // Allocate an empty buffer for denoised_frame_prev.
-  denoised_frame_prev->CreateEmptyFrame(width_, height_, stride_y_, stride_u_,
-                                        stride_v_);
+  *denoised_frame_prev = new rtc::RefCountedObject<I420Buffer>(
+      width_, height_, stride_y_, stride_u_, stride_v_);
   // Allocate and initialize denoised_frame with key frame.
-  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());
+  *denoised_frame = I420Buffer::CopyKeepStride(frame);
 
   // 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_]);
   moving_object_.reset(new uint8_t[mb_cols_ * mb_rows_]);
 }
 
@@ skipping 109 matching lines @@
     const uint8_t* margin_y_src = y_src + (mb_cols_ << 4);
     uint8_t* margin_y_dst = y_dst + (mb_cols_ << 4);
     for (int i = 0; i < height_; ++i) {
       for (int j = mb_cols_ << 4; j < width_; ++j) {
         margin_y_dst[i * stride_y_ + j] = margin_y_src[i * stride_y_ + j];
       }
     }
   }
 }
 
-void VideoDenoiser::DenoiseFrame(const VideoFrame& frame,
-                                 VideoFrame* denoised_frame,
-                                 VideoFrame* denoised_frame_prev,
-                                 bool noise_estimation_enabled) {
+void VideoDenoiser::DenoiseFrame(
+    const rtc::scoped_refptr<VideoFrameBuffer>& frame,
+    rtc::scoped_refptr<I420Buffer>* denoised_frame,
+    rtc::scoped_refptr<I420Buffer>* 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()) {
+  if (width_ != frame->width() || height_ != frame->height()) {
     DenoiserReset(frame, denoised_frame, denoised_frame_prev);
     return;
   }
 
   // Set buffer pointers.
-  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();
+  const uint8_t* y_src = frame->DataY();
+  const uint8_t* u_src = frame->DataU();
+  const uint8_t* v_src = frame->DataV();
+  uint8_t* y_dst = (*denoised_frame)->MutableDataY();
+  uint8_t* u_dst = (*denoised_frame)->MutableDataU();
+  uint8_t* v_dst = (*denoised_frame)->MutableDataV();
+  uint8_t* y_dst_prev = (*denoised_frame_prev)->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 73 matching lines @@
   // When frame width/height not divisible by 16, copy the margin to
   // denoised_frame.
   if ((mb_rows_ << 4) != height_ || (mb_cols_ << 4) != width_)
     CopyLumaOnMargin(y_src, y_dst);
 
   // TODO(jackychen): Need SSE2/NEON opt.
   // Copy u/v planes.
   memcpy(u_dst, u_src, (height_ >> 1) * stride_u_);
   memcpy(v_dst, v_src, (height_ >> 1) * stride_v_);
 
-  // Set time parameters to the output frame.
-  denoised_frame->set_timestamp(frame.timestamp());
-  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