From 5cd7d2aa0f93d7051956f34929a525151012601b Mon Sep 17 00:00:00 2001 From: Alessio Bazzica Date: Wed, 2 Mar 2022 16:31:50 +0100 Subject: [PATCH] audioproc_f: fix AGC1 digital adaptive flag bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - missing negation causes the opposite behavior when `analog_agc_disable_digital_adaptive` is used - flag replaced with `analog_agc_use_digital_adaptive_controller` which is less error-prone Bug: webrtc:7494 Change-Id: If9e0ba4fc9e539c73269faf9096ca782620dac6d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251322 Reviewed-by: Per Åhgren Commit-Queue: Alessio Bazzica Cr-Commit-Position: refs/heads/main@{#36113} --- .../test/audio_processing_simulator.cc | 4 ++-- .../test/audio_processing_simulator.h | 2 +- modules/audio_processing/test/audioproc_float_impl.cc | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc index 4915648fa9..5923fc34f6 100644 --- a/modules/audio_processing/test/audio_processing_simulator.cc +++ b/modules/audio_processing/test/audio_processing_simulator.cc @@ -565,9 +565,9 @@ void AudioProcessingSimulator::ConfigureAudioProcessor() { apm_config.gain_controller1.analog_gain_controller.enabled = *settings_.use_analog_agc; } - if (settings_.analog_agc_disable_digital_adaptive) { + if (settings_.analog_agc_use_digital_adaptive_controller) { apm_config.gain_controller1.analog_gain_controller.enable_digital_adaptive = - *settings_.analog_agc_disable_digital_adaptive; + *settings_.analog_agc_use_digital_adaptive_controller; } if (settings_.maximum_internal_processing_rate) { diff --git a/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h index af76d7e1c9..71f8eab160 100644 --- a/modules/audio_processing/test/audio_processing_simulator.h +++ b/modules/audio_processing/test/audio_processing_simulator.h @@ -106,7 +106,7 @@ struct SimulationSettings { absl::optional use_ts; absl::optional use_analog_agc; absl::optional use_all; - absl::optional analog_agc_disable_digital_adaptive; + absl::optional analog_agc_use_digital_adaptive_controller; absl::optional agc_mode; absl::optional agc_target_level; absl::optional use_agc_limiter; diff --git a/modules/audio_processing/test/audioproc_float_impl.cc b/modules/audio_processing/test/audioproc_float_impl.cc index aab1881913..9055b64081 100644 --- a/modules/audio_processing/test/audioproc_float_impl.cc +++ b/modules/audio_processing/test/audioproc_float_impl.cc @@ -123,10 +123,10 @@ ABSL_FLAG(bool, "Activate all of the default components (will be overridden by any " "other settings)"); ABSL_FLAG(int, - analog_agc_disable_digital_adaptive, + analog_agc_use_digital_adaptive_controller, kParameterNotSpecifiedValue, - "Force-deactivate (1) digital adaptation in " - "experimental AGC. Digital adaptation is active by default (0)."); + "Activate (1) or deactivate (0) digital adaptation in AGC1. " + "Digital adaptation is active by default."); ABSL_FLAG(int, agc_mode, kParameterNotSpecifiedValue, @@ -412,8 +412,9 @@ SimulationSettings CreateSettings() { SetSettingIfSpecified(absl::GetFlag(FLAGS_ts), &settings.use_ts); SetSettingIfFlagSet(absl::GetFlag(FLAGS_analog_agc), &settings.use_analog_agc); - SetSettingIfFlagSet(absl::GetFlag(FLAGS_analog_agc_disable_digital_adaptive), - &settings.analog_agc_disable_digital_adaptive); + SetSettingIfFlagSet( + absl::GetFlag(FLAGS_analog_agc_use_digital_adaptive_controller), + &settings.analog_agc_use_digital_adaptive_controller); SetSettingIfSpecified(absl::GetFlag(FLAGS_agc_mode), &settings.agc_mode); SetSettingIfSpecified(absl::GetFlag(FLAGS_agc_target_level), &settings.agc_target_level);