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

audioproc_f: fix AGC1 digital adaptive flag bug

Browse Source 
- 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 <peah@webrtc.org>
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36113}
This commit is contained in:
Alessio Bazzica
2022-03-02 16:31:50 +01:00
committed by WebRTC LUCI CQ
parent d6cdf80072
commit 5cd7d2aa0f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/audio_processing/test/audio_processing_simulator.cc
View File

@ -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) {

2
modules/audio_processing/test/audio_processing_simulator.h
View File

@ -106,7 +106,7 @@ struct SimulationSettings {
absl::optional<int> use_ts;
absl::optional<bool> use_analog_agc;
absl::optional<bool> use_all;
absl::optional<bool> analog_agc_disable_digital_adaptive;
absl::optional<bool> analog_agc_use_digital_adaptive_controller;
absl::optional<int> agc_mode;
absl::optional<int> agc_target_level;
absl::optional<bool> use_agc_limiter;

11
modules/audio_processing/test/audioproc_float_impl.cc
View File

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