Remove the usage of the field-trial WebRTC-Aec3AecStateFullResetKillSwitch Bug: webrtc:42233815 Change-Id: Iaa470fc0b0877198091b1620480f347fa137c703 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/465584 Commit-Queue: Per Ã…hgren <peah@webrtc.org> Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47520}
diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index d97fda3..4c25a58 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc
@@ -44,10 +44,6 @@ "WebRTC-Aec3DeactivateInitialStateResetKillSwitch"); } -bool FullResetAtEchoPathChange(const FieldTrialsView& field_trials) { - return !field_trials.IsEnabled("WebRTC-Aec3AecStateFullResetKillSwitch"); -} - bool SubtractorAnalyzerResetAtEchoPathChange( const FieldTrialsView& field_trials) { return !field_trials.IsEnabled( @@ -133,8 +129,6 @@ num_capture_channels_(num_capture_channels), deactivate_initial_state_reset_at_echo_path_change_( DeactivateInitialStateResetAtEchoPathChange(env.field_trials())), - full_reset_at_echo_path_change_( - FullResetAtEchoPathChange(env.field_trials())), subtractor_analyzer_reset_at_echo_path_change_( SubtractorAnalyzerResetAtEchoPathChange(env.field_trials())), initial_state_(config_), @@ -175,9 +169,8 @@ // TODO(peah): Refine the reset scheme according to the type of gain and // delay adjustment. - if (full_reset_at_echo_path_change_ && - echo_path_variability.delay_change != - EchoPathVariability::DelayAdjustment::kNone) { + if (echo_path_variability.delay_change != + EchoPathVariability::DelayAdjustment::kNone) { full_reset(); } else if (echo_path_variability.gain_change) { erle_estimator_.Reset(false);
diff --git a/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h index df5bc65..26bd2ee 100644 --- a/modules/audio_processing/aec3/aec_state.h +++ b/modules/audio_processing/aec3/aec_state.h
@@ -167,7 +167,6 @@ const EchoCanceller3Config config_; const size_t num_capture_channels_; const bool deactivate_initial_state_reset_at_echo_path_change_; - const bool full_reset_at_echo_path_change_; const bool subtractor_analyzer_reset_at_echo_path_change_; // Class for controlling the transition from the intial state, which in turn