AEC3: Turn off the specific suppressor mode for stationary render

Bug: webrtc:9998,chromium:905291
Change-Id: I0e9f029227349dcde280895d905e90cc90f3e072
Reviewed-on: https://webrtc-review.googlesource.com/c/110902
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25640}
This commit is contained in:
Per Åhgren 2018-11-14 16:01:45 +01:00 committed by Commit Bot
parent cc55032053
commit 1724a80e2d
2 changed files with 10 additions and 15 deletions

View File

@ -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 {

View File

@ -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()) {