| Index: webrtc/modules/video_processing/frame_preprocessor.h
|
| diff --git a/webrtc/modules/video_processing/frame_preprocessor.h b/webrtc/modules/video_processing/frame_preprocessor.h
|
| index 4c5a6e4c90ec35eacff01417255f7aa94b13f4e3..4ac6b76e83074f9e24d7ffbe16237a461a2d6a9f 100644
|
| --- a/webrtc/modules/video_processing/frame_preprocessor.h
|
| +++ b/webrtc/modules/video_processing/frame_preprocessor.h
|
| @@ -14,7 +14,6 @@
|
| #include <memory>
|
|
|
| #include "webrtc/modules/video_processing/include/video_processing.h"
|
| -#include "webrtc/modules/video_processing/content_analysis.h"
|
| #include "webrtc/modules/video_processing/spatial_resampler.h"
|
| #include "webrtc/modules/video_processing/video_decimator.h"
|
| #include "webrtc/typedefs.h"
|
| @@ -38,9 +37,6 @@ class VPMFramePreprocessor {
|
|
|
| void SetInputFrameResampleMode(VideoFrameResampling resampling_mode);
|
|
|
| - // Enable content analysis.
|
| - void EnableContentAnalysis(bool enable);
|
| -
|
| // Set target resolution: frame rate and dimension.
|
| int32_t SetTargetResolution(uint32_t width,
|
| uint32_t height,
|
| @@ -59,21 +55,17 @@ class VPMFramePreprocessor {
|
| // Preprocess output:
|
| void EnableDenoising(bool enable);
|
| const VideoFrame* PreprocessFrame(const VideoFrame& frame);
|
| - VideoContentMetrics* GetContentMetrics() const;
|
|
|
| private:
|
| // The content does not change so much every frame, so to reduce complexity
|
| // we can compute new content metrics every |kSkipFrameCA| frames.
|
| enum { kSkipFrameCA = 2 };
|
|
|
| - VideoContentMetrics* content_metrics_;
|
| VideoFrame denoised_frame_[2];
|
| VideoFrame resampled_frame_;
|
| VPMSpatialResampler* spatial_resampler_;
|
| - VPMContentAnalysis* ca_;
|
| VPMVideoDecimator* vd_;
|
| std::unique_ptr<VideoDenoiser> denoiser_;
|
| - bool enable_ca_;
|
| uint8_t denoised_frame_toggle_;
|
| uint32_t frame_cnt_;
|
| };
|
|
|