commit a8565425bc6b1d3d7b5a0b0e0a49bc4e57c64f21
author mflodman <mflodman@webrtc.org> Mon Dec 07 01:09:52 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 07 09:10:01 2015 +0000
tree b3240d2624c3f1e4848ad9e57b383c78d5eabbf4
parent 2512f443975c1dc71391bf6cadf587e0ced3344a

Initial VideoProcessing refactoring.

This CL is the first in a series of CLs to refactor
VideoProcessing(Module) to follow Google C++ style guide and make the
code more readable.

This CL removed inheritance from Module, renames variables and makes
VideoProcessingImpl::PreprocessFrame return a frame pointer if there
is a frame to send, nullptr otherwise. The affected CLs also passes git
cl lint.

BUG=webrtc:5259

Review URL: https://codereview.webrtc.org/1482913003

Cr-Commit-Position: refs/heads/master@{#10907}

webrtc/modules/video_processing/video_processing_impl.h

diff --git a/webrtc/modules/video_processing/video_processing_impl.h b/webrtc/modules/video_processing/video_processing_impl.h
index b71aa82..edbaba1 100644
--- a/webrtc/modules/video_processing/video_processing_impl.h
+++ b/webrtc/modules/video_processing/video_processing_impl.h
@@ -13,7 +13,6 @@
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/brighten.h"
 #include "webrtc/modules/video_processing/brightness_detection.h"
 #include "webrtc/modules/video_processing/deflickering.h"
 #include "webrtc/modules/video_processing/frame_preprocessor.h"
@@ -21,47 +20,28 @@
 namespace webrtc {
 class CriticalSectionWrapper;
 
-class VideoProcessingModuleImpl : public VideoProcessingModule {
+class VideoProcessingImpl : public VideoProcessing {
  public:
-  VideoProcessingModuleImpl();
-  ~VideoProcessingModuleImpl() override;
+  VideoProcessingImpl();
+  ~VideoProcessingImpl() override;
 
-  void Reset() override;
-
+  // Implements VideoProcessing.
   int32_t Deflickering(VideoFrame* frame, FrameStats* stats) override;
-
   int32_t BrightnessDetection(const VideoFrame& frame,
                               const FrameStats& stats) override;
-
-  // Frame pre-processor functions
-
-  // Enable temporal decimation
   void EnableTemporalDecimation(bool enable) override;
-
   void SetInputFrameResampleMode(VideoFrameResampling resampling_mode) override;
-
-  // Enable content analysis
   void EnableContentAnalysis(bool enable) override;
-
-  // Set Target Resolution: frame rate and dimension
   int32_t SetTargetResolution(uint32_t width,
                               uint32_t height,
                               uint32_t frame_rate) override;
-
   void SetTargetFramerate(int frame_rate) override;
-
-  // Get decimated values: frame rate/dimension
-  uint32_t Decimatedframe_rate() override;
-  uint32_t DecimatedWidth() const override;
-  uint32_t DecimatedHeight() const override;
-
-  // Preprocess:
-  // Pre-process incoming frame: Sample when needed and compute content
-  // metrics when enabled.
-  // If no resampling takes place - processed_frame is set to NULL.
-  int32_t PreprocessFrame(const VideoFrame& frame,
-                          VideoFrame** processed_frame) override;
-  VideoContentMetrics* ContentMetrics() const override;
+  uint32_t GetDecimatedFrameRate() override;
+  uint32_t GetDecimatedWidth() const override;
+  uint32_t GetDecimatedHeight() const override;
+  void EnableDenosing(bool enable) override;
+  const VideoFrame* PreprocessFrame(const VideoFrame& frame) override;
+  VideoContentMetrics* GetContentMetrics() const override;
 
  private:
   mutable rtc::CriticalSection mutex_;
@@ -70,6 +50,6 @@
   VPMFramePreprocessor frame_pre_processor_;
 };
 
-}  // namespace
+}  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_