From 224a140339485a291ae64322ff45a5ad5a72df5e Mon Sep 17 00:00:00 2001 From: "aluebs@webrtc.org" Date: Thu, 3 Jul 2014 13:41:39 +0000 Subject: [PATCH] Make experimental NS API not purely virtual Because not all subclasses will want to bother overriding these methods. R=bjornv@webrtc.org, kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18689004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6592 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_processing/audio_processing_impl.cc | 4 ---- webrtc/modules/audio_processing/audio_processing_impl.h | 4 ---- webrtc/modules/audio_processing/include/audio_processing.h | 4 ++-- .../modules/audio_processing/include/mock_audio_processing.h | 4 ---- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index de387edb2f..cc2b5c002c 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -303,10 +303,6 @@ void AudioProcessingImpl::SetExtraOptions(const Config& config) { (*it)->SetExtraOptions(config); } -int AudioProcessingImpl::EnableExperimentalNs(bool enable) { - return kNoError; -} - int AudioProcessingImpl::input_sample_rate_hz() const { CriticalSectionScoped crit_scoped(crit_); return fwd_in_format_.rate(); diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index d34f305a96..9753423d6d 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -92,10 +92,6 @@ class AudioProcessingImpl : public AudioProcessing { ChannelLayout output_layout, ChannelLayout reverse_layout) OVERRIDE; virtual void SetExtraOptions(const Config& config) OVERRIDE; - virtual int EnableExperimentalNs(bool enable) OVERRIDE; - virtual bool experimental_ns_enabled() const OVERRIDE { - return false; - } virtual int set_sample_rate_hz(int rate) OVERRIDE; virtual int input_sample_rate_hz() const OVERRIDE; virtual int sample_rate_hz() const OVERRIDE; diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index 1e494d18a0..6f4cc9e723 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -209,8 +209,8 @@ class AudioProcessing { // ensures the options are applied immediately. virtual void SetExtraOptions(const Config& config) = 0; - virtual int EnableExperimentalNs(bool enable) = 0; - virtual bool experimental_ns_enabled() const = 0; + virtual int EnableExperimentalNs(bool enable) { return kNoError; } + virtual bool experimental_ns_enabled() const { return false; } // DEPRECATED. // TODO(ajm): Remove after Chromium has upgraded to using Initialize(). diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/webrtc/modules/audio_processing/include/mock_audio_processing.h index c1ac23adf7..8258bb6cff 100644 --- a/webrtc/modules/audio_processing/include/mock_audio_processing.h +++ b/webrtc/modules/audio_processing/include/mock_audio_processing.h @@ -186,10 +186,6 @@ class MockAudioProcessing : public AudioProcessing { ChannelLayout reverse_layout)); MOCK_METHOD1(SetExtraOptions, void(const Config& config)); - MOCK_METHOD1(EnableExperimentalNs, - int(bool enable)); - MOCK_CONST_METHOD0(experimental_ns_enabled, - bool()); MOCK_METHOD1(set_sample_rate_hz, int(int rate)); MOCK_CONST_METHOD0(input_sample_rate_hz,