Standalone denoiser (off by default).

webrtc/modules/video_processing/frame_preprocessor.cc

 /*
  *  Copyright (c) 2012 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/modules/video_processing/frame_preprocessor.h"
+#include "webrtc/modules/video_processing/video_denoiser.h"
 
 namespace webrtc {
 
 VPMFramePreprocessor::VPMFramePreprocessor()
     : content_metrics_(NULL),
       resampled_frame_(),
       enable_ca_(false),
+      enable_denoising_(false),
       frame_cnt_(0) {
   spatial_resampler_ = new VPMSimpleSpatialResampler();
   ca_ = new VPMContentAnalysis(true);
   vd_ = new VPMVideoDecimator();
+  video_denoiser_ = new VideoDenoiser();
 }
 
 VPMFramePreprocessor::~VPMFramePreprocessor() {
   Reset();
-  delete spatial_resampler_;
   delete ca_;
   delete vd_;
+  delete video_denoiser_;
+  delete spatial_resampler_;
 }
 
 void  VPMFramePreprocessor::Reset() {
   ca_->Release();
   vd_->Reset();
   content_metrics_ = NULL;
   spatial_resampler_->Reset();
   enable_ca_ = false;
   frame_cnt_ = 0;
 }
@@ skipping 60 matching lines @@
 
   vd_->UpdateIncomingframe_rate();
 
   if (vd_->DropFrame()) {
     return 1;  // drop 1 frame
   }
 
   // Resizing incoming frame if needed. Otherwise, remains NULL.
   // We are not allowed to resample the input frame (must make a copy of it).
   *processed_frame = NULL;
+  if (enable_denoising_) {

[mflodman, 2015/11/25 12:15:19]

I'd prefer to skip this bool and instead check if (video_denoiser_ != nullptr)
instead. Then only create video_denoiser_ when it's actually going to be used.

[jackychen, 2015/11/25 20:29:05]

Done.

+    video_denoiser_->DenoiseFrame(frame, &denoised_frame_);
+    *processed_frame = &denoised_frame_;
+  }
+
   if (spatial_resampler_->ApplyResample(frame.width(), frame.height()))  {
-    int32_t ret = spatial_resampler_->ResampleFrame(frame, &resampled_frame_);
+    int32_t ret;
+    if (enable_denoising_) {

[mflodman, 2015/11/25 12:15:19]

I think we can avoid this check by refactor this method, but that can be done as
a follow up since this is the way it's been done previously.

[jackychen, 2015/11/25 20:29:05]

OK. Will do in a follow up cl.

[mflodman, 2015/11/26 10:50:00]

I filed a bug to keep track of the coming clean-up work and assigned to me, so
I'll keep that as a side project the coming weeks (/months). I'll start when
this CL has been submitted to not interfere with this work.

https://bugs.chromium.org/p/webrtc/issues/detail?id=5259

+      ret = spatial_resampler_->ResampleFrame(denoised_frame_,
+                                              &resampled_frame_);
+    } else {
+      ret = spatial_resampler_->ResampleFrame(frame, &resampled_frame_);
+    }
     if (ret != VPM_OK) return ret;
     *processed_frame = &resampled_frame_;
   }
 
   // Perform content analysis on the frame to be encoded.
   if (enable_ca_) {
     // Compute new metrics every |kSkipFramesCA| frames, starting with
     // the first frame.
     if (frame_cnt_ % kSkipFrameCA == 0) {
       if (*processed_frame == NULL)  {
         content_metrics_ = ca_->ComputeContentMetrics(frame);
       } else {
-        content_metrics_ = ca_->ComputeContentMetrics(resampled_frame_);
+        content_metrics_ = ca_->ComputeContentMetrics(**processed_frame);
       }
     }
-    ++frame_cnt_;
   }
+  ++frame_cnt_;
   return VPM_OK;
 }
 
 VideoContentMetrics* VPMFramePreprocessor::ContentMetrics() const {
   return content_metrics_;
 }
 
 }  // namespace