diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h index d8e6f24668..b998a055a8 100644 --- a/api/audio/echo_canceller3_config.h +++ b/api/audio/echo_canceller3_config.h @@ -102,7 +102,7 @@ struct RTC_EXPORT EchoCanceller3Config { float audibility_threshold_lf = 10; float audibility_threshold_mf = 10; float audibility_threshold_hf = 10; - bool use_stationary_properties = false; + bool use_stationarity_properties = false; bool use_stationarity_properties_at_init = false; } echo_audibility; diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc index 249a48cd08..8c698fad17 100644 --- a/api/audio/echo_canceller3_config_json.cc +++ b/api/audio/echo_canceller3_config_json.cc @@ -218,8 +218,8 @@ void Aec3ConfigFromJsonString(absl::string_view json_string, &cfg.echo_audibility.audibility_threshold_mf); ReadParam(section, "audibility_threshold_hf", &cfg.echo_audibility.audibility_threshold_hf); - ReadParam(section, "use_stationary_properties", - &cfg.echo_audibility.use_stationary_properties); + ReadParam(section, "use_stationarity_properties", + &cfg.echo_audibility.use_stationarity_properties); ReadParam(section, "use_stationarity_properties_at_init", &cfg.echo_audibility.use_stationarity_properties_at_init); } @@ -430,8 +430,8 @@ std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) { << config.echo_audibility.audibility_threshold_mf << ","; ost << "\"audibility_threshold_hf\": " << config.echo_audibility.audibility_threshold_hf << ","; - ost << "\"use_stationary_properties\": " - << (config.echo_audibility.use_stationary_properties ? "true" : "false") + ost << "\"use_stationarity_properties\": " + << (config.echo_audibility.use_stationarity_properties ? "true" : "false") << ","; ost << "\"use_stationarity_properties_at_init\": " << (config.echo_audibility.use_stationarity_properties_at_init ? "true" diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index 53186259a0..179d98fe73 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc @@ -82,10 +82,10 @@ void AecState::HandleEchoPathChange( blocks_with_active_render_ = 0; initial_state_.Reset(); transparent_state_.Reset(); - legacy_saturation_detector_.Reset(); + legacy_saturation_detector_.Reset(); erle_estimator_.Reset(true); erl_estimator_.Reset(); - filter_quality_state_.Reset(); + filter_quality_state_.Reset(); }; // TODO(peah): Refine the reset scheme according to the type of gain and @@ -143,7 +143,7 @@ void AecState::Update( config_.ep_strength.reverb_based_on_render ? ReverbDecay() : 0.f, X2_reverb); - if (config_.echo_audibility.use_stationary_properties) { + if (config_.echo_audibility.use_stationarity_properties) { // Update the echo audibility evaluator. echo_audibility_.Update(render_buffer, render_reverb_.GetReverbContributionPowerSpectrum(), @@ -189,7 +189,7 @@ void AecState::Update( // Update the reverb estimate. const bool stationary_block = - config_.echo_audibility.use_stationary_properties && + config_.echo_audibility.use_stationarity_properties && echo_audibility_.IsBlockStationary(); reverb_model_estimator_.Update(filter_analyzer_.GetAdjustedFilter(), diff --git a/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h index 1887492f8a..51a8ec01a8 100644 --- a/modules/audio_processing/aec3/aec_state.h +++ b/modules/audio_processing/aec3/aec_state.h @@ -68,7 +68,7 @@ class AecState { // Returns whether the stationary properties of the signals are used in the // aec. bool UseStationaryProperties() const { - return config_.echo_audibility.use_stationary_properties; + return config_.echo_audibility.use_stationarity_properties; } // Returns the ERLE.