External VNR speed improvement and more.

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_(nullptr),
       resampled_frame_(),
       enable_ca_(false),
       frame_cnt_(0) {
   spatial_resampler_ = new VPMSimpleSpatialResampler();
   ca_ = new VPMContentAnalysis(true);
   vd_ = new VPMVideoDecimator();
   EnableDenosing(false);
+  denoised_frame_toggle_ = 0;
 }
 
 VPMFramePreprocessor::~VPMFramePreprocessor() {
   Reset();
   delete ca_;
   delete vd_;
   delete spatial_resampler_;
 }
 
 void VPMFramePreprocessor::Reset() {
@@ skipping 73 matching lines @@
     return nullptr;
   }
 
   vd_->UpdateIncomingframe_rate();
   if (vd_->DropFrame()) {
     return nullptr;
   }
 
   const VideoFrame* current_frame = &frame;
   if (denoiser_) {
-    denoiser_->DenoiseFrame(*current_frame, &denoised_frame_,
-                            &denoised_frame_prev_, 0);
-    current_frame = &denoised_frame_;
+    VideoFrame* denoised_frame = &denoised_frame_[0];
+    VideoFrame* denoised_frame_prev = &denoised_frame_[1];
+    // Swap the buffer to save one memcpy in DenoiseFrame.
+    if (denoised_frame_toggle_) {
+      denoised_frame = &denoised_frame_[1];
+      denoised_frame_prev = &denoised_frame_[0];
+    }
+    // Invert the flag.
+    denoised_frame_toggle_ ^= 1;
+    denoiser_->DenoiseFrame(*current_frame, denoised_frame, denoised_frame_prev,
+                            true);
+    current_frame = denoised_frame;
   }
 
   if (spatial_resampler_->ApplyResample(current_frame->width(),
                                         current_frame->height())) {
     if (spatial_resampler_->ResampleFrame(*current_frame, &resampled_frame_) !=
         VPM_OK) {
       return nullptr;
     }
     current_frame = &resampled_frame_;
   }
 
   // Perform content analysis on the frame to be encoded.
   if (enable_ca_ && frame_cnt_ % kSkipFrameCA == 0) {
     // Compute new metrics every |kSkipFramesCA| frames, starting with
     // the first frame.
     content_metrics_ = ca_->ComputeContentMetrics(*current_frame);
   }
   ++frame_cnt_;
   return current_frame;
 }
 
 VideoContentMetrics* VPMFramePreprocessor::GetContentMetrics() const {
   return content_metrics_;
 }
 
 }  // namespace webrtc