APM config: remove `ExperimentalAgc`
Bug: webrtc:5298,webrtc:7494
Change-Id: Ic9bcb702603ec7900fbe9ae38ab49dff8fe99318
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219463
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35015}
diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index 7facd25..9b149311 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -304,17 +304,6 @@
// TODO(webrtc:5298): Remove once the use of ExperimentalNs has been
// deprecated.
config_.transient_suppression.enabled = config.Get<ExperimentalNs>().enabled;
-
- // TODO(webrtc:5298): Remove once the use of ExperimentalAgc has been
- // deprecated.
- config_.gain_controller1.analog_gain_controller.enabled =
- config.Get<ExperimentalAgc>().enabled;
- config_.gain_controller1.analog_gain_controller.startup_min_volume =
- config.Get<ExperimentalAgc>().startup_min_volume;
- config_.gain_controller1.analog_gain_controller.clipped_level_min =
- config.Get<ExperimentalAgc>().clipped_level_min;
- config_.gain_controller1.analog_gain_controller.enable_digital_adaptive =
- !config.Get<ExperimentalAgc>().digital_adaptive_disabled;
#endif
Initialize();
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 8887ca2..a752e91 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -66,22 +66,6 @@
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.
//
// Use to enable experimental noise suppression. It can be set in the
diff --git a/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h
index 7fab178..5fa0490 100644
--- a/modules/audio_processing/include/config.h
+++ b/modules/audio_processing/include/config.h
@@ -28,7 +28,7 @@
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 392e8ac..fb7bde8 100644
--- a/test/fuzzers/audio_processing_configs_fuzzer.cc
+++ b/test/fuzzers/audio_processing_configs_fuzzer.cc
@@ -39,7 +39,7 @@
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<void>(fuzz_data->ReadOrDefaultValue(true));
bool exp_ns = fuzz_data->ReadOrDefaultValue(true);
static_cast<void>(fuzz_data->ReadOrDefaultValue(true));
static_cast<void>(fuzz_data->ReadOrDefaultValue(true));
@@ -105,7 +105,6 @@
echo_control_factory.reset(new EchoCanceller3Factory());
}
- config.Set<ExperimentalAgc>(new ExperimentalAgc(exp_agc));
config.Set<ExperimentalNs>(new ExperimentalNs(exp_ns));
rtc::scoped_refptr<AudioProcessing> apm =
