Fix some chromium-style warnings in webrtc/modules/audio_processing/

BUG=163
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4472 4adac7df-926f-26a2-2b94-8c16560cd09d

12 files changed, 143 insertions, 136 deletions

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index ac5fa9bb72..143da44cdf 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -51,6 +51,9 @@ void AudioProcessing::Destroy(AudioProcessing* apm) {
   delete static_cast<AudioProcessingImpl*>(apm);
 }
 
+int32_t AudioProcessing::TimeUntilNextProcess() { return -1; }
+int32_t AudioProcessing::Process() { return -1; }
+
 AudioProcessingImpl::AudioProcessingImpl(int id)
     : id_(id),
       echo_cancellation_(NULL),
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index 831eabb8c6..b0afd6d330 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -56,34 +56,36 @@ class AudioProcessingImpl : public AudioProcessing {
   bool was_stream_delay_set() const;
 
   // AudioProcessing methods.
-  virtual int Initialize();
+  virtual int Initialize() OVERRIDE;
   virtual int InitializeLocked();
-  virtual void SetExtraOptions(const Config& config);
-  virtual int set_sample_rate_hz(int rate);
-  virtual int sample_rate_hz() const;
-  virtual int set_num_channels(int input_channels, int output_channels);
-  virtual int num_input_channels() const;
-  virtual int num_output_channels() const;
-  virtual int set_num_reverse_channels(int channels);
-  virtual int num_reverse_channels() const;
-  virtual int ProcessStream(AudioFrame* frame);
-  virtual int AnalyzeReverseStream(AudioFrame* frame);
-  virtual int set_stream_delay_ms(int delay);
-  virtual int stream_delay_ms() const;
-  virtual void set_delay_offset_ms(int offset);
-  virtual int delay_offset_ms() const;
-  virtual int StartDebugRecording(const char filename[kMaxFilenameSize]);
-  virtual int StopDebugRecording();
-  virtual EchoCancellation* echo_cancellation() const;
-  virtual EchoControlMobile* echo_control_mobile() const;
-  virtual GainControl* gain_control() const;
-  virtual HighPassFilter* high_pass_filter() const;
-  virtual LevelEstimator* level_estimator() const;
-  virtual NoiseSuppression* noise_suppression() const;
-  virtual VoiceDetection* voice_detection() const;
+  virtual void SetExtraOptions(const Config& config) OVERRIDE;
+  virtual int set_sample_rate_hz(int rate) OVERRIDE;
+  virtual int sample_rate_hz() const OVERRIDE;
+  virtual int set_num_channels(int input_channels,
+                               int output_channels) OVERRIDE;
+  virtual int num_input_channels() const OVERRIDE;
+  virtual int num_output_channels() const OVERRIDE;
+  virtual int set_num_reverse_channels(int channels) OVERRIDE;
+  virtual int num_reverse_channels() const OVERRIDE;
+  virtual int ProcessStream(AudioFrame* frame) OVERRIDE;
+  virtual int AnalyzeReverseStream(AudioFrame* frame) OVERRIDE;
+  virtual int set_stream_delay_ms(int delay) OVERRIDE;
+  virtual int stream_delay_ms() const OVERRIDE;
+  virtual void set_delay_offset_ms(int offset) OVERRIDE;
+  virtual int delay_offset_ms() const OVERRIDE;
+  virtual int StartDebugRecording(
+      const char filename[kMaxFilenameSize]) OVERRIDE;
+  virtual int StopDebugRecording() OVERRIDE;
+  virtual EchoCancellation* echo_cancellation() const OVERRIDE;
+  virtual EchoControlMobile* echo_control_mobile() const OVERRIDE;
+  virtual GainControl* gain_control() const OVERRIDE;
+  virtual HighPassFilter* high_pass_filter() const OVERRIDE;
+  virtual LevelEstimator* level_estimator() const OVERRIDE;
+  virtual NoiseSuppression* noise_suppression() const OVERRIDE;
+  virtual VoiceDetection* voice_detection() const OVERRIDE;
 
   // Module methods.
-  virtual int32_t ChangeUniqueId(const int32_t id);
+  virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
 
  private:
   bool is_data_processed() const;
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h
index 74d9ecf1e5..07506d4e03 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.h
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h
@@ -24,42 +24,42 @@ class EchoCancellationImpl : public EchoCancellationImplWrapper {
   virtual ~EchoCancellationImpl();
 
   // EchoCancellationImplWrapper implementation.
-  virtual int ProcessRenderAudio(const AudioBuffer* audio);
-  virtual int ProcessCaptureAudio(AudioBuffer* audio);
+  virtual int ProcessRenderAudio(const AudioBuffer* audio) OVERRIDE;
+  virtual int ProcessCaptureAudio(AudioBuffer* audio) OVERRIDE;
 
   // EchoCancellation implementation.
-  virtual bool is_enabled() const;
-  virtual int device_sample_rate_hz() const;
-  virtual int stream_drift_samples() const;
+  virtual bool is_enabled() const OVERRIDE;
+  virtual int device_sample_rate_hz() const OVERRIDE;
+  virtual int stream_drift_samples() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual int Initialize();
+  virtual int Initialize() OVERRIDE;
 
  private:
   // EchoCancellation implementation.
-  virtual int Enable(bool enable);
-  virtual int enable_drift_compensation(bool enable);
-  virtual bool is_drift_compensation_enabled() const;
-  virtual int set_device_sample_rate_hz(int rate);
-  virtual void set_stream_drift_samples(int drift);
-  virtual int set_suppression_level(SuppressionLevel level);
-  virtual SuppressionLevel suppression_level() const;
-  virtual int enable_metrics(bool enable);
-  virtual bool are_metrics_enabled() const;
-  virtual bool stream_has_echo() const;
-  virtual int GetMetrics(Metrics* metrics);
-  virtual int enable_delay_logging(bool enable);
-  virtual bool is_delay_logging_enabled() const;
-  virtual int GetDelayMetrics(int* median, int* std);
-  virtual struct AecCore* aec_core() const;
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int enable_drift_compensation(bool enable) OVERRIDE;
+  virtual bool is_drift_compensation_enabled() const OVERRIDE;
+  virtual int set_device_sample_rate_hz(int rate) OVERRIDE;
+  virtual void set_stream_drift_samples(int drift) OVERRIDE;
+  virtual int set_suppression_level(SuppressionLevel level) OVERRIDE;
+  virtual SuppressionLevel suppression_level() const OVERRIDE;
+  virtual int enable_metrics(bool enable) OVERRIDE;
+  virtual bool are_metrics_enabled() const OVERRIDE;
+  virtual bool stream_has_echo() const OVERRIDE;
+  virtual int GetMetrics(Metrics* metrics) OVERRIDE;
+  virtual int enable_delay_logging(bool enable) OVERRIDE;
+  virtual bool is_delay_logging_enabled() const OVERRIDE;
+  virtual int GetDelayMetrics(int* median, int* std) OVERRIDE;
+  virtual struct AecCore* aec_core() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
   bool drift_compensation_enabled_;
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.h b/webrtc/modules/audio_processing/echo_control_mobile_impl.h
index 9b69cbc288..5eefab0a3c 100644
--- a/webrtc/modules/audio_processing/echo_control_mobile_impl.h
+++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.h
@@ -28,28 +28,28 @@ class EchoControlMobileImpl : public EchoControlMobile,
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // EchoControlMobile implementation.
-  virtual bool is_enabled() const;
+  virtual bool is_enabled() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual int Initialize();
+  virtual int Initialize() OVERRIDE;
 
  private:
   // EchoControlMobile implementation.
-  virtual int Enable(bool enable);
-  virtual int set_routing_mode(RoutingMode mode);
-  virtual RoutingMode routing_mode() const;
-  virtual int enable_comfort_noise(bool enable);
-  virtual bool is_comfort_noise_enabled() const;
-  virtual int SetEchoPath(const void* echo_path, size_t size_bytes);
-  virtual int GetEchoPath(void* echo_path, size_t size_bytes) const;
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int set_routing_mode(RoutingMode mode) OVERRIDE;
+  virtual RoutingMode routing_mode() const OVERRIDE;
+  virtual int enable_comfort_noise(bool enable) OVERRIDE;
+  virtual bool is_comfort_noise_enabled() const OVERRIDE;
+  virtual int SetEchoPath(const void* echo_path, size_t size_bytes) OVERRIDE;
+  virtual int GetEchoPath(void* echo_path, size_t size_bytes) const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
   RoutingMode routing_mode_;
diff --git a/webrtc/modules/audio_processing/gain_control_impl.h b/webrtc/modules/audio_processing/gain_control_impl.h
index 4c58f22534..2de02f6e6b 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.h
+++ b/webrtc/modules/audio_processing/gain_control_impl.h
@@ -31,36 +31,36 @@ class GainControlImpl : public GainControl,
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // ProcessingComponent implementation.
-  virtual int Initialize();
+  virtual int Initialize() OVERRIDE;
 
   // GainControl implementation.
-  virtual bool is_enabled() const;
-  virtual int stream_analog_level();
+  virtual bool is_enabled() const OVERRIDE;
+  virtual int stream_analog_level() OVERRIDE;
 
  private:
   // GainControl implementation.
-  virtual int Enable(bool enable);
-  virtual int set_stream_analog_level(int level);
-  virtual int set_mode(Mode mode);
-  virtual Mode mode() const;
-  virtual int set_target_level_dbfs(int level);
-  virtual int target_level_dbfs() const;
-  virtual int set_compression_gain_db(int gain);
-  virtual int compression_gain_db() const;
-  virtual int enable_limiter(bool enable);
-  virtual bool is_limiter_enabled() const;
-  virtual int set_analog_level_limits(int minimum, int maximum);
-  virtual int analog_level_minimum() const;
-  virtual int analog_level_maximum() const;
-  virtual bool stream_is_saturated() const;
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int set_stream_analog_level(int level) OVERRIDE;
+  virtual int set_mode(Mode mode) OVERRIDE;
+  virtual Mode mode() const OVERRIDE;
+  virtual int set_target_level_dbfs(int level) OVERRIDE;
+  virtual int target_level_dbfs() const OVERRIDE;
+  virtual int set_compression_gain_db(int gain) OVERRIDE;
+  virtual int compression_gain_db() const OVERRIDE;
+  virtual int enable_limiter(bool enable) OVERRIDE;
+  virtual bool is_limiter_enabled() const OVERRIDE;
+  virtual int set_analog_level_limits(int minimum, int maximum) OVERRIDE;
+  virtual int analog_level_minimum() const OVERRIDE;
+  virtual int analog_level_maximum() const OVERRIDE;
+  virtual bool stream_is_saturated() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
   Mode mode_;
diff --git a/webrtc/modules/audio_processing/high_pass_filter_impl.h b/webrtc/modules/audio_processing/high_pass_filter_impl.h
index 1531df9998..7e11ea9cee 100644
--- a/webrtc/modules/audio_processing/high_pass_filter_impl.h
+++ b/webrtc/modules/audio_processing/high_pass_filter_impl.h
@@ -27,19 +27,19 @@ class HighPassFilterImpl : public HighPassFilter,
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // HighPassFilter implementation.
-  virtual bool is_enabled() const;
+  virtual bool is_enabled() const OVERRIDE;
 
  private:
   // HighPassFilter implementation.
-  virtual int Enable(bool enable);
+  virtual int Enable(bool enable) OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
 };
diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h
index 3fb80b08ca..2edea8ad70 100644
--- a/webrtc/modules/audio_processing/include/audio_processing.h
+++ b/webrtc/modules/audio_processing/include/audio_processing.h
@@ -258,8 +258,8 @@ class AudioProcessing : public Module {
   };
 
   // Inherited from Module.
-  virtual int32_t TimeUntilNextProcess() { return -1; }
-  virtual int32_t Process() { return -1; }
+  virtual int32_t TimeUntilNextProcess() OVERRIDE;
+  virtual int32_t Process() OVERRIDE;
 };
 
 // The acoustic echo cancellation (AEC) component provides better performance
diff --git a/webrtc/modules/audio_processing/level_estimator_impl.h b/webrtc/modules/audio_processing/level_estimator_impl.h
index 11191faf1d..20dc18dc42 100644
--- a/webrtc/modules/audio_processing/level_estimator_impl.h
+++ b/webrtc/modules/audio_processing/level_estimator_impl.h
@@ -27,20 +27,20 @@ class LevelEstimatorImpl : public LevelEstimator,
   int ProcessStream(AudioBuffer* audio);
 
   // LevelEstimator implementation.
-  virtual bool is_enabled() const;
+  virtual bool is_enabled() const OVERRIDE;
 
  private:
   // LevelEstimator implementation.
-  virtual int Enable(bool enable);
-  virtual int RMS();
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int RMS() OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
 };
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.h b/webrtc/modules/audio_processing/noise_suppression_impl.h
index 198cfc7676..f6dd8cbd78 100644
--- a/webrtc/modules/audio_processing/noise_suppression_impl.h
+++ b/webrtc/modules/audio_processing/noise_suppression_impl.h
@@ -27,22 +27,22 @@ class NoiseSuppressionImpl : public NoiseSuppression,
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // NoiseSuppression implementation.
-  virtual bool is_enabled() const;
-  float speech_probability() const;
+  virtual bool is_enabled() const OVERRIDE;
+  virtual float speech_probability() const OVERRIDE;
 
  private:
   // NoiseSuppression implementation.
-  virtual int Enable(bool enable);
-  virtual int set_level(Level level);
-  virtual Level level() const;
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int set_level(Level level) OVERRIDE;
+  virtual Level level() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
   Level level_;
diff --git a/webrtc/modules/audio_processing/processing_component.cc b/webrtc/modules/audio_processing/processing_component.cc
index 37721c0661..c34c976e1f 100644
--- a/webrtc/modules/audio_processing/processing_component.cc
+++ b/webrtc/modules/audio_processing/processing_component.cc
@@ -16,6 +16,8 @@
 
 namespace webrtc {
 
+ProcessingComponent::ProcessingComponent() {}
+
 ProcessingComponent::ProcessingComponent(const AudioProcessingImpl* apm)
   : apm_(apm),
     initialized_(false),
diff --git a/webrtc/modules/audio_processing/processing_component.h b/webrtc/modules/audio_processing/processing_component.h
index a5ee1859ee..c090d22245 100644
--- a/webrtc/modules/audio_processing/processing_component.h
+++ b/webrtc/modules/audio_processing/processing_component.h
@@ -21,7 +21,7 @@ class AudioProcessingImpl;
 
 class ProcessingComponent {
  public:
-  ProcessingComponent() {}
+  ProcessingComponent();
   explicit ProcessingComponent(const AudioProcessingImpl* apm);
   virtual ~ProcessingComponent();
 
diff --git a/webrtc/modules/audio_processing/voice_detection_impl.h b/webrtc/modules/audio_processing/voice_detection_impl.h
index f52f503ae1..f8f50e8493 100644
--- a/webrtc/modules/audio_processing/voice_detection_impl.h
+++ b/webrtc/modules/audio_processing/voice_detection_impl.h
@@ -27,28 +27,28 @@ class VoiceDetectionImpl : public VoiceDetection,
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // VoiceDetection implementation.
-  virtual bool is_enabled() const;
+  virtual bool is_enabled() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual int Initialize();
+  virtual int Initialize() OVERRIDE;
 
  private:
   // VoiceDetection implementation.
-  virtual int Enable(bool enable);
-  virtual int set_stream_has_voice(bool has_voice);
-  virtual bool stream_has_voice() const;
-  virtual int set_likelihood(Likelihood likelihood);
-  virtual Likelihood likelihood() const;
-  virtual int set_frame_size_ms(int size);
-  virtual int frame_size_ms() const;
+  virtual int Enable(bool enable) OVERRIDE;
+  virtual int set_stream_has_voice(bool has_voice) OVERRIDE;
+  virtual bool stream_has_voice() const OVERRIDE;
+  virtual int set_likelihood(Likelihood likelihood) OVERRIDE;
+  virtual Likelihood likelihood() const OVERRIDE;
+  virtual int set_frame_size_ms(int size) OVERRIDE;
+  virtual int frame_size_ms() const OVERRIDE;
 
   // ProcessingComponent implementation.
-  virtual void* CreateHandle() const;
-  virtual int InitializeHandle(void* handle) const;
-  virtual int ConfigureHandle(void* handle) const;
-  virtual int DestroyHandle(void* handle) const;
-  virtual int num_handles_required() const;
-  virtual int GetHandleError(void* handle) const;
+  virtual void* CreateHandle() const OVERRIDE;
+  virtual int InitializeHandle(void* handle) const OVERRIDE;
+  virtual int ConfigureHandle(void* handle) const OVERRIDE;
+  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual int num_handles_required() const OVERRIDE;
+  virtual int GetHandleError(void* handle) const OVERRIDE;
 
   const AudioProcessingImpl* apm_;
   bool stream_has_voice_;