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

Remove AudioProcessing::SetExtraOptions.

Browse Source 
Bug: webrtc:5298
Change-Id: I28be75df69b66aa59ae91b05cb7f9afad4f55aa1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/182120
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32033}
This commit is contained in:
Mirko Bonadei
2020-09-03 13:24:36 +02:00
committed by Commit Bot
parent ea8f739bce
commit c94650d88f
5 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/engine/webrtc_voice_engine.h
View File

@ -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<bool> experimental_ns_;
// Jitter buffer settings for new streams.
size_t audio_jitter_buffer_max_packets_ = 200;

3
modules/audio_processing/audio_processing_impl.cc
View File

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

1
modules/audio_processing/audio_processing_impl.h
View File

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

6
modules/audio_processing/include/audio_processing.h
View File

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

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

@ -88,10 +88,6 @@ class MockAudioProcessing : public ::testing::NiceMock<AudioProcessing> {
(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));