diff --git a/api/audio/echo_canceller3_config.cc b/api/audio/echo_canceller3_config.cc index a560c9eb20..617f5aeca0 100644 --- a/api/audio/echo_canceller3_config.cc +++ b/api/audio/echo_canceller3_config.cc @@ -171,10 +171,6 @@ bool EchoCanceller3Config::Validate(EchoCanceller3Config* config) { res = res & Limit(&c->echo_model.noise_gate_slope, 0, 1000000.f); res = res & Limit(&c->echo_model.render_pre_window_size, 0, 100); res = res & Limit(&c->echo_model.render_post_window_size, 0, 100); - res = res & Limit(&c->echo_model.render_pre_window_size_init, 0, 100); - res = res & Limit(&c->echo_model.render_post_window_size_init, 0, 100); - res = res & Limit(&c->echo_model.nonlinear_hold, 0, 100); - res = res & Limit(&c->echo_model.nonlinear_release, 0, 1.f); res = res & Limit(&c->suppressor.nearend_average_blocks, 1, 5000); diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h index 7dcc7dd9c2..e304f15ec5 100644 --- a/api/audio/echo_canceller3_config.h +++ b/api/audio/echo_canceller3_config.h @@ -125,10 +125,6 @@ struct RTC_EXPORT EchoCanceller3Config { float noise_gate_slope = 0.3f; size_t render_pre_window_size = 1; size_t render_post_window_size = 1; - size_t render_pre_window_size_init = 10; - size_t render_post_window_size_init = 10; - float nonlinear_hold = 1; - float nonlinear_release = 0.001f; } echo_model; struct Suppressor { diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc index 4c8c8ab6f4..07c4e52447 100644 --- a/api/audio/echo_canceller3_config_json.cc +++ b/api/audio/echo_canceller3_config_json.cc @@ -250,12 +250,6 @@ void Aec3ConfigFromJsonString(absl::string_view json_string, &cfg.echo_model.render_pre_window_size); ReadParam(section, "render_post_window_size", &cfg.echo_model.render_post_window_size); - ReadParam(section, "render_pre_window_size_init", - &cfg.echo_model.render_pre_window_size_init); - ReadParam(section, "render_post_window_size_init", - &cfg.echo_model.render_post_window_size_init); - ReadParam(section, "nonlinear_hold", &cfg.echo_model.nonlinear_hold); - ReadParam(section, "nonlinear_release", &cfg.echo_model.nonlinear_release); } Json::Value subsection; @@ -463,13 +457,7 @@ std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) { ost << "\"render_pre_window_size\": " << config.echo_model.render_pre_window_size << ","; ost << "\"render_post_window_size\": " - << config.echo_model.render_post_window_size << ","; - ost << "\"render_pre_window_size_init\": " - << config.echo_model.render_pre_window_size_init << ","; - ost << "\"render_post_window_size_init\": " - << config.echo_model.render_post_window_size_init << ","; - ost << "\"nonlinear_hold\": " << config.echo_model.nonlinear_hold << ","; - ost << "\"nonlinear_release\": " << config.echo_model.nonlinear_release; + << config.echo_model.render_post_window_size; ost << "},"; ost << "\"suppressor\": {";