From 8da7b350cf93beff4ecef4b3aced5b80707dcc1b Mon Sep 17 00:00:00 2001 From: Alessio Bazzica Date: Wed, 21 Nov 2018 10:50:58 +0100 Subject: [PATCH] AGC2 adaptive digital false by default Avoid that the client code relies on the adaptive digital mode being enabled by default (error prone). Bug: webrtc:7494 Change-Id: I765fecf535cf31a2163e10595a42520473c233b6 Reviewed-on: https://webrtc-review.googlesource.com/c/111586 Reviewed-by: Alex Loiko Commit-Queue: Alessio Bazzica Cr-Commit-Position: refs/heads/master@{#25728} --- modules/audio_processing/gain_controller2_unittest.cc | 2 ++ modules/audio_processing/include/audio_processing.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/audio_processing/gain_controller2_unittest.cc b/modules/audio_processing/gain_controller2_unittest.cc index 94837f5070..27d540a198 100644 --- a/modules/audio_processing/gain_controller2_unittest.cc +++ b/modules/audio_processing/gain_controller2_unittest.cc @@ -261,6 +261,7 @@ TEST(GainController2, UsageSaturationMargin) { // high. They should not be amplified at all, but only after convergence. GC2 // starts with a gain, and it takes time until it's down to 0 dB. config.fixed_digital.gain_db = 0.f; + config.adaptive_digital.enabled = true; config.adaptive_digital.extra_saturation_margin_db = 50.f; gain_controller2.ApplyConfig(config); @@ -274,6 +275,7 @@ TEST(GainController2, UsageNoSaturationMargin) { AudioProcessing::Config::GainController2 config; // Check that some gain is applied if there is no margin. config.fixed_digital.gain_db = 0.f; + config.adaptive_digital.enabled = true; config.adaptive_digital.extra_saturation_margin_db = 0.f; gain_controller2.ApplyConfig(config); diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 5467a388e9..9a1a03c852 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -276,7 +276,7 @@ class AudioProcessing : public rtc::RefCountInterface { float gain_db = 0.f; } fixed_digital; struct { - bool enabled = true; + bool enabled = false; LevelEstimator level_estimator = kRms; bool use_saturation_protector = true; float extra_saturation_margin_db = 2.f;