diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 7facd25c12..9b1493116c 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -304,17 +304,6 @@ AudioProcessingImpl::AudioProcessingImpl( // TODO(webrtc:5298): Remove once the use of ExperimentalNs has been // deprecated. config_.transient_suppression.enabled = config.Get().enabled; - - // TODO(webrtc:5298): Remove once the use of ExperimentalAgc has been - // deprecated. - config_.gain_controller1.analog_gain_controller.enabled = - config.Get().enabled; - config_.gain_controller1.analog_gain_controller.startup_min_volume = - config.Get().startup_min_volume; - config_.gain_controller1.analog_gain_controller.clipped_level_min = - config.Get().clipped_level_min; - config_.gain_controller1.analog_gain_controller.enable_digital_adaptive = - !config.Get().digital_adaptive_disabled; #endif Initialize(); diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 8887ca2ebd..a752e91b29 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -65,22 +65,6 @@ static constexpr int kAgcStartupMinVolume = 0; #endif // defined(WEBRTC_CHROMIUM_BUILD) static constexpr int kClippedLevelMin = 70; -// To be deprecated: Please instead use the flag in the -// AudioProcessing::Config::AnalogGainController. -// TODO(webrtc:5298): Remove. -struct ExperimentalAgc { - ExperimentalAgc() = default; - explicit ExperimentalAgc(bool enabled) : enabled(enabled) {} - ExperimentalAgc(bool enabled, int startup_min_volume) - : enabled(enabled), startup_min_volume(startup_min_volume) {} - static const ConfigOptionID identifier = ConfigOptionID::kExperimentalAgc; - bool enabled = true; - int startup_min_volume = kAgcStartupMinVolume; - // Lowest microphone level that will be applied in response to clipping. - int clipped_level_min = kClippedLevelMin; - bool digital_adaptive_disabled = false; -}; - // To be deprecated: Please instead use the flag in the // AudioProcessing::Config::TransientSuppression. // diff --git a/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h index 7fab17831c..5fa04901a7 100644 --- a/modules/audio_processing/include/config.h +++ b/modules/audio_processing/include/config.h @@ -28,7 +28,7 @@ enum class ConfigOptionID { kVoicePacing, // Deprecated kExtendedFilter, // Deprecated kDelayAgnostic, // Deprecated - kExperimentalAgc, + kExperimentalAgc, // Deprecated kExperimentalNs, kBeamforming, // Deprecated kIntelligibility, // Deprecated diff --git a/test/fuzzers/audio_processing_configs_fuzzer.cc b/test/fuzzers/audio_processing_configs_fuzzer.cc index 392e8ac4ff..fb7bde8f0f 100644 --- a/test/fuzzers/audio_processing_configs_fuzzer.cc +++ b/test/fuzzers/audio_processing_configs_fuzzer.cc @@ -39,7 +39,7 @@ rtc::scoped_refptr CreateApm(test::FuzzDataHelper* fuzz_data, rtc::TaskQueue* worker_queue) { // Parse boolean values for optionally enabling different // configurable public components of APM. - bool exp_agc = fuzz_data->ReadOrDefaultValue(true); + static_cast(fuzz_data->ReadOrDefaultValue(true)); bool exp_ns = fuzz_data->ReadOrDefaultValue(true); static_cast(fuzz_data->ReadOrDefaultValue(true)); static_cast(fuzz_data->ReadOrDefaultValue(true)); @@ -105,7 +105,6 @@ rtc::scoped_refptr CreateApm(test::FuzzDataHelper* fuzz_data, echo_control_factory.reset(new EchoCanceller3Factory()); } - config.Set(new ExperimentalAgc(exp_agc)); config.Set(new ExperimentalNs(exp_ns)); rtc::scoped_refptr apm =