Further AGC refactoring in preparation for adding multichannel support
Bug: webrtc:10859
Change-Id: If7d58a615a365a0b0f7b49e0cc2392b9bd5e2a0c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159028
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29736}
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 52fbaba..80474f8 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -114,13 +114,18 @@
explicit ExperimentalAgc(bool enabled) : enabled(enabled) {}
ExperimentalAgc(bool enabled,
bool enabled_agc2_level_estimator,
+ bool digital_adaptive_disabled)
+ : enabled(enabled),
+ enabled_agc2_level_estimator(enabled_agc2_level_estimator),
+ digital_adaptive_disabled(digital_adaptive_disabled) {}
+ // Deprecated constructor: will be removed.
+ ExperimentalAgc(bool enabled,
+ bool enabled_agc2_level_estimator,
bool digital_adaptive_disabled,
bool analyze_before_aec)
: enabled(enabled),
enabled_agc2_level_estimator(enabled_agc2_level_estimator),
- digital_adaptive_disabled(digital_adaptive_disabled),
- analyze_before_aec(analyze_before_aec) {}
-
+ digital_adaptive_disabled(digital_adaptive_disabled) {}
ExperimentalAgc(bool enabled, int startup_min_volume)
: enabled(enabled), startup_min_volume(startup_min_volume) {}
ExperimentalAgc(bool enabled, int startup_min_volume, int clipped_level_min)
@@ -134,9 +139,6 @@
int clipped_level_min = kClippedLevelMin;
bool enabled_agc2_level_estimator = false;
bool digital_adaptive_disabled = false;
- // 'analyze_before_aec' is an experimental flag. It is intended to be removed
- // at some point.
- bool analyze_before_aec = false;
};
// Use to enable experimental noise suppression. It can be set in the