zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark all virtual overrides in the hierarchy of Module as virtual and OVERRIDE.

Browse Source 
This will make a subsequent change I intend to do safer, where I'll change the
return type of one of the base Module functions, by breaking the compile if I
miss any overrides.

This also highlighted a number of unused functions (in many cases apparently
virtual "overrides" of no-longer-existent base functions).  I've removed some of
these.

This also highlighted several cases where "virtual" was used unnecessarily to
mark a function that was only defined in one class.  Removed "virtual" in those
cases.

BUG=none
TEST=none
R=andrew@webrtc.org, henrik.lundin@webrtc.org, mallinath@webrtc.org, mflodman@webrtc.org, stefan@webrtc.org, turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24419004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7146 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-09-11 06:20:28 +00:00
parent 4c876453c8
commit 1972ff8a6e
25 changed files with 344 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_processing/main/interface/video_processing.h
View File

@ -89,12 +89,12 @@ class VideoProcessingModule : public Module {
/**
Not supported.
*/
virtual int32_t TimeUntilNextProcess() { return -1; }
virtual int32_t TimeUntilNextProcess() OVERRIDE { return -1; }
/**
Not supported.
*/
virtual int32_t Process() { return -1; }
virtual int32_t Process() OVERRIDE { return -1; }
/**
Resets all processing components to their initial states. This should be

28
webrtc/modules/video_processing/main/source/video_processing_impl.h
View File

@ -29,43 +29,45 @@ class VideoProcessingModuleImpl : public VideoProcessingModule {
int32_t Id() const;
virtual int32_t ChangeUniqueId(const int32_t id);
virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
virtual void Reset();
virtual void Reset() OVERRIDE;
virtual int32_t Deflickering(I420VideoFrame* frame, FrameStats* stats);
virtual int32_t Deflickering(I420VideoFrame* frame,
FrameStats* stats) OVERRIDE;
virtual int32_t BrightnessDetection(const I420VideoFrame& frame,
const FrameStats& stats);
const FrameStats& stats) OVERRIDE;
// Frame pre-processor functions
// Enable temporal decimation
virtual void EnableTemporalDecimation(bool enable);
virtual void EnableTemporalDecimation(bool enable) OVERRIDE;
virtual void SetInputFrameResampleMode(VideoFrameResampling resampling_mode);
virtual void SetInputFrameResampleMode(
VideoFrameResampling resampling_mode) OVERRIDE;
// Enable content analysis
virtual void EnableContentAnalysis(bool enable);
virtual void EnableContentAnalysis(bool enable) OVERRIDE;
// Set Target Resolution: frame rate and dimension
virtual int32_t SetTargetResolution(uint32_t width,
uint32_t height,
uint32_t frame_rate);
uint32_t frame_rate) OVERRIDE;
// Get decimated values: frame rate/dimension
virtual uint32_t Decimatedframe_rate();
virtual uint32_t DecimatedWidth() const;
virtual uint32_t DecimatedHeight() const;
virtual uint32_t Decimatedframe_rate() OVERRIDE;
virtual uint32_t DecimatedWidth() const OVERRIDE;
virtual 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.
virtual int32_t PreprocessFrame(const I420VideoFrame& frame,
I420VideoFrame** processed_frame);
virtual VideoContentMetrics* ContentMetrics() const;
I420VideoFrame** processed_frame) OVERRIDE;
virtual VideoContentMetrics* ContentMetrics() const OVERRIDE;
private:
int32_t id_;