diff --git a/modules/audio_processing/agc2/adaptive_digital_gain_controller_unittest.cc b/modules/audio_processing/agc2/adaptive_digital_gain_controller_unittest.cc index e95cbb5067..cff9b4eb83 100644 --- a/modules/audio_processing/agc2/adaptive_digital_gain_controller_unittest.cc +++ b/modules/audio_processing/agc2/adaptive_digital_gain_controller_unittest.cc @@ -93,10 +93,12 @@ TEST(GainController2AdaptiveDigitalGainControllerTest, MaxGainApplied) { GetMaxGainChangePerFrameDb( kDefaultConfig.max_gain_change_db_per_second)) + kNumExtraFrames; - - GainApplierHelper helper(kDefaultConfig, kAdjacentSpeechFramesThreshold); + constexpr AdaptiveDigitalConfig kConfig = AdaptiveDigitalConfig{ + // Increase from the default in order to reach the maximum gain. + .max_output_noise_level_dbfs = -40.0f}; + GainApplierHelper helper(kConfig, kAdjacentSpeechFramesThreshold); AdaptiveDigitalGainController::FrameInfo info = - GetFrameInfoToNotAdapt(kDefaultConfig); + GetFrameInfoToNotAdapt(kConfig); info.speech_level_dbfs = -60.0f; float applied_gain; for (int i = 0; i < kNumFramesToAdapt; ++i) { diff --git a/modules/audio_processing/agc2/speech_level_estimator_unittest.cc b/modules/audio_processing/agc2/speech_level_estimator_unittest.cc index e1c5f85434..2e627a4d12 100644 --- a/modules/audio_processing/agc2/speech_level_estimator_unittest.cc +++ b/modules/audio_processing/agc2/speech_level_estimator_unittest.cc @@ -152,7 +152,7 @@ TEST(GainController2SpeechLevelEstimator, ConvergenceSpeedAfterConfidence) { level_estimator.initial_speech_level_dbfs); ASSERT_TRUE(level_estimator.estimator->is_confident()); // After confidence. - constexpr float kConvergenceTimeAfterConfidenceNumFrames = 600; // 6 seconds. + constexpr float kConvergenceTimeAfterConfidenceNumFrames = 700; // 7 seconds. static_assert( kConvergenceTimeAfterConfidenceNumFrames > kNumFramesToConfidence, ""); RunOnConstantLevel( diff --git a/modules/audio_processing/gain_controller2_unittest.cc b/modules/audio_processing/gain_controller2_unittest.cc index 5023bab617..71642dc38c 100644 --- a/modules/audio_processing/gain_controller2_unittest.cc +++ b/modules/audio_processing/gain_controller2_unittest.cc @@ -450,7 +450,7 @@ TEST(GainController2, CheckFinalGainWithAdaptiveDigitalController) { const float applied_gain_db = 20.0f * std::log10(audio_buffer.channels_const()[0][0]); - constexpr float kExpectedGainDb = 5.6f; + constexpr float kExpectedGainDb = 7.0f; constexpr float kToleranceDb = 0.3f; EXPECT_NEAR(applied_gain_db, kExpectedGainDb, kToleranceDb); } diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index dd484be4f1..02fb497e28 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -361,10 +361,10 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { return !(*this == rhs); } bool enabled = false; - float headroom_db = 6.0f; - float max_gain_db = 30.0f; - float initial_gain_db = 8.0f; - float max_gain_change_db_per_second = 3.0f; + float headroom_db = 5.0f; + float max_gain_db = 50.0f; + float initial_gain_db = 15.0f; + float max_gain_change_db_per_second = 6.0f; float max_output_noise_level_dbfs = -50.0f; } adaptive_digital;