diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h index 251f282539..9939e6e4ff 100644 --- a/api/audio/echo_canceller3_config.h +++ b/api/audio/echo_canceller3_config.h @@ -106,8 +106,8 @@ struct RTC_EXPORT EchoCanceller3Config { float audibility_threshold_lf = 10; float audibility_threshold_mf = 10; float audibility_threshold_hf = 10; - bool use_stationary_properties = true; - bool use_stationarity_properties_at_init = true; + bool use_stationary_properties = false; + bool use_stationarity_properties_at_init = false; } echo_audibility; struct RenderLevels { diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc index 5debcda349..c7e2de3340 100644 --- a/modules/audio_processing/aec3/echo_canceller3.cc +++ b/modules/audio_processing/aec3/echo_canceller3.cc @@ -68,14 +68,12 @@ bool UseLegacyNormalSuppressorTuning() { return field_trial::IsEnabled("WebRTC-Aec3UseLegacyNormalSuppressorTuning"); } -bool DeactivateStationarityProperties() { - return field_trial::IsEnabled( - "WebRTC-Aec3UseStationarityPropertiesKillSwitch"); +bool ActivateStationarityProperties() { + return field_trial::IsEnabled("WebRTC-Aec3UseStationarityProperties"); } -bool DeactivateStationarityPropertiesAtInit() { - return field_trial::IsEnabled( - "WebRTC-Aec3UseStationarityPropertiesAtInitKillSwitch"); +bool ActivateStationarityPropertiesAtInit() { + return field_trial::IsEnabled("WebRTC-Aec3UseStationarityPropertiesAtInit"); } bool EnableNewRenderBuffering() { @@ -154,15 +152,12 @@ EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config) { adjusted_cfg.suppressor.dominant_nearend_detection.hold_duration = 25; } - // TODO(peah): Clean this up once upstream dependencies that forces this to - // zero are resolved. - adjusted_cfg.echo_audibility.use_stationary_properties = true; - if (DeactivateStationarityProperties()) { - adjusted_cfg.echo_audibility.use_stationary_properties = false; + if (ActivateStationarityProperties()) { + adjusted_cfg.echo_audibility.use_stationary_properties = true; } - if (DeactivateStationarityPropertiesAtInit()) { - adjusted_cfg.echo_audibility.use_stationarity_properties_at_init = false; + if (ActivateStationarityPropertiesAtInit()) { + adjusted_cfg.echo_audibility.use_stationarity_properties_at_init = true; } if (!UseEarlyDelayDetection()) {