generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make experimental NS API not purely virtual

Browse Source 
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
This commit is contained in:
aluebs@webrtc.org 2014-07-03 13:41:39 +00:00
parent c0ba4392f1
commit 224a140339
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -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();

4
webrtc/modules/audio_processing/audio_processing_impl.h
View File

@ -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;

4
webrtc/modules/audio_processing/include/audio_processing.h
View File

@ -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().

4
webrtc/modules/audio_processing/include/mock_audio_processing.h
View File

@ -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,