From 9bf67eae29359cf40b7d75a5298b9f4eb4a30109 Mon Sep 17 00:00:00 2001 From: Gustaf Ullberg Date: Tue, 12 Feb 2019 12:23:02 +0100 Subject: [PATCH] AEC3: Fix delay hysteresis validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The configuration validation checked the wrong hysteresis limit. Bug: webrtc:8671 Change-Id: Icd49ae612925e306aa4db01afce2d43b75792b9c Reviewed-on: https://webrtc-review.googlesource.com/c/122461 Commit-Queue: Gustaf Ullberg Reviewed-by: Per Åhgren Cr-Commit-Position: refs/heads/master@{#26647} --- api/audio/echo_canceller3_config.cc | 4 ++-- .../aec3/signal_dependent_erle_estimator_unittest.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/audio/echo_canceller3_config.cc b/api/audio/echo_canceller3_config.cc index 29d31cb426..c3053a4c41 100644 --- a/api/audio/echo_canceller3_config.cc +++ b/api/audio/echo_canceller3_config.cc @@ -88,8 +88,8 @@ bool EchoCanceller3Config::Validate(EchoCanceller3Config* config) { res = false; } if (c->delay.delay_headroom_blocks <= 1 && - c->delay.hysteresis_limit_1_blocks == 1) { - c->delay.hysteresis_limit_1_blocks = 0; + c->delay.hysteresis_limit_2_blocks == 1) { + c->delay.hysteresis_limit_2_blocks = 0; res = false; } res = res & Limit(&c->delay.default_delay, 0, 5000); diff --git a/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc b/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc index 78224304a4..6ce4e97447 100644 --- a/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc +++ b/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc @@ -139,6 +139,7 @@ TEST(SignalDependentErleEstimator, LongerRun) { cfg.filter.main_initial.length_blocks = 1; cfg.delay.delay_headroom_blocks = 0; cfg.delay.hysteresis_limit_1_blocks = 0; + cfg.delay.hysteresis_limit_2_blocks = 0; cfg.erle.num_sections = 2; EXPECT_EQ(EchoCanceller3Config::Validate(&cfg), true); std::array average_erle;