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_denoise_(false),
       frame_cnt_(0) {
   spatial_resampler_ = new VPMSimpleSpatialResampler();
   ca_ = new VPMContentAnalysis(true);
   vd_ = new VPMVideoDecimator();
+  vdn_ = new VideoDenoiser();
 }
 
 VPMFramePreprocessor::~VPMFramePreprocessor() {
   Reset();
-  delete spatial_resampler_;
   delete ca_;
   delete vd_;
+  delete vdn_;
+  delete spatial_resampler_;
 }
 
 void  VPMFramePreprocessor::Reset() {
   ca_->Release();
   vd_->Reset();
   content_metrics_ = NULL;
   spatial_resampler_->Reset();
   enable_ca_ = false;
   frame_cnt_ = 0;
 }
@@ skipping 66 matching lines @@
 
   // 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 (spatial_resampler_->ApplyResample(frame.width(), frame.height()))  {
     int32_t ret = spatial_resampler_->ResampleFrame(frame, &resampled_frame_);
     if (ret != VPM_OK) return ret;
     *processed_frame = &resampled_frame_;
   }
 
+  if (enable_denoise_) {
+    vdn_->DenoiseFrame(frame, &denoised_frame_);

[stefan-webrtc, 2015/11/23 10:12:52]

What if we have resampled the frame above? Then I'd assume we denoise
*processed_frame  instead?

[jackychen, 2015/11/23 19:44:59]

I reordered the code, so that resample will be working on the denoised frame. I
think this might be better.

+    *processed_frame = &denoised_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_);

[stefan-webrtc, 2015/11/23 10:12:52]

Should this use *processed_frame instead?

[jackychen, 2015/11/23 19:44:59]

Maybe Marco can change it in another cl, but for my part, resampled_frame_ and
*processed_frame should be the same.

[stefan-webrtc, 2015/11/24 08:56:18]

But if denoising is on, but no resampling is done, then *processed_frame will be
pointing at &denoised_frame_, but the metrics will be computed on the
uninitialized resampled_frame_. That must be wrong, or am I missing something?

[jackychen, 2015/11/24 22:33:05]

You are right. Done.

       }
     }
-    ++frame_cnt_;
   }
+  ++frame_cnt_;
   return VPM_OK;
 }
 
 VideoContentMetrics* VPMFramePreprocessor::ContentMetrics() const {
   return content_metrics_;
 }
 
 }  // namespace