From c94650d88fd7c1041b0ab7ab1ced78b2dfb5c27b Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 3 Sep 2020 13:24:36 +0200 Subject: [PATCH] Remove AudioProcessing::SetExtraOptions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:5298 Change-Id: I28be75df69b66aa59ae91b05cb7f9afad4f55aa1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/182120 Commit-Queue: Mirko Bonadei Reviewed-by: Per Åhgren Cr-Commit-Position: refs/heads/master@{#32033} --- media/engine/webrtc_voice_engine.h | 3 +-- modules/audio_processing/audio_processing_impl.cc | 3 --- modules/audio_processing/audio_processing_impl.h | 1 - modules/audio_processing/include/audio_processing.h | 6 +----- modules/audio_processing/include/mock_audio_processing.h | 4 ---- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h index 86a7a495fe..79c22370d3 100644 --- a/media/engine/webrtc_voice_engine.h +++ b/media/engine/webrtc_voice_engine.h @@ -119,8 +119,7 @@ class WebRtcVoiceEngine final : public VoiceEngineInterface { bool initialized_ = false; // Cache experimental_ns and apply in case they are missing in the audio - // options. We need to do this because SetExtraOptions() will revert to - // defaults for options which are not provided. + // options. absl::optional experimental_ns_; // Jitter buffer settings for new streams. size_t audio_jitter_buffer_max_packets_ = 200; diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 82cc6f1148..67208dfadd 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -641,9 +641,6 @@ void AudioProcessingImpl::ApplyConfig(const AudioProcessing::Config& config) { } } -// TODO(webrtc:5298): Remove. -void AudioProcessingImpl::SetExtraOptions(const webrtc::Config& config) {} - void AudioProcessingImpl::OverrideSubmoduleCreationForTesting( const ApmSubmoduleCreationOverrides& overrides) { MutexLock lock(&mutex_capture_); diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h index ac411b48cf..d0eec0eec3 100644 --- a/modules/audio_processing/audio_processing_impl.h +++ b/modules/audio_processing/audio_processing_impl.h @@ -72,7 +72,6 @@ class AudioProcessingImpl : public AudioProcessing { ChannelLayout render_input_layout) override; int Initialize(const ProcessingConfig& processing_config) override; void ApplyConfig(const AudioProcessing::Config& config) override; - void SetExtraOptions(const webrtc::Config& config) override; bool CreateAndAttachAecDump(const std::string& file_name, int64_t max_log_size_bytes, rtc::TaskQueue* worker_queue) override; diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index a30b930072..32401afd6d 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -104,7 +104,7 @@ struct ExperimentalAgc { // AudioProcessing::Config::TransientSuppression. // // Use to enable experimental noise suppression. It can be set in the -// constructor or using AudioProcessing::SetExtraOptions(). +// constructor. // TODO(webrtc:5298): Remove. struct ExperimentalNs { ExperimentalNs() : enabled(false) {} @@ -516,10 +516,6 @@ class RTC_EXPORT AudioProcessing : public rtc::RefCountInterface { // over the parameters in the audio processing module and is likely to change. virtual void ApplyConfig(const Config& config) = 0; - // Pass down additional options which don't have explicit setters. This - // ensures the options are applied immediately. - virtual void SetExtraOptions(const webrtc::Config& config) {} - // TODO(ajm): Only intended for internal use. Make private and friend the // necessary classes? virtual int proc_sample_rate_hz() const = 0; diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h index 562b23f7d5..2055f7e511 100644 --- a/modules/audio_processing/include/mock_audio_processing.h +++ b/modules/audio_processing/include/mock_audio_processing.h @@ -88,10 +88,6 @@ class MockAudioProcessing : public ::testing::NiceMock { (const ProcessingConfig& processing_config), (override)); MOCK_METHOD(void, ApplyConfig, (const Config& config), (override)); - MOCK_METHOD(void, - SetExtraOptions, - (const webrtc::Config& config), - (override)); MOCK_METHOD(int, proc_sample_rate_hz, (), (const, override)); MOCK_METHOD(int, proc_split_sample_rate_hz, (), (const, override)); MOCK_METHOD(size_t, num_input_channels, (), (const, override));