commit ec51ce0ce1a2b56198104064c4b266acfaee1c47
author Gustaf Ullberg <gustaf@webrtc.org> Thu Apr 04 11:38:52 2019
committer Commit Bot <commit-bot@chromium.org> Thu Apr 04 12:36:48 2019
tree 6ec4bec0828d4fe22f02cecaaf7f5186c24b5e01
parent 6c371ca7005adde9812d9527bea64f552cf53867

AEC3: Remove unused config parameters

This change removes the following unused parameters from the AEC3
configuration:
- render_pre_window_size_init
- render_post_window_size_init
- nonlinear_hold
- nonlinear_release

Bug: webrtc:8671
Change-Id: I8f7a3d350387cd8ada4d507c3a9fab43b7813f5c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131321
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27450}

api/audio/echo_canceller3_config.cc

diff --git a/api/audio/echo_canceller3_config.cc b/api/audio/echo_canceller3_config.cc
index a560c9e..617f5ae 100644
--- a/api/audio/echo_canceller3_config.cc
+++ b/api/audio/echo_canceller3_config.cc
@@ -171,10 +171,6 @@
   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);
 

api/audio/echo_canceller3_config.h

diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h
index 7dcc7dd..e304f15 100644
--- a/api/audio/echo_canceller3_config.h
+++ b/api/audio/echo_canceller3_config.h
@@ -125,10 +125,6 @@
     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 {

api/audio/echo_canceller3_config_json.cc

diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc
index 4c8c8ab..07c4e52 100644
--- a/api/audio/echo_canceller3_config_json.cc
+++ b/api/audio/echo_canceller3_config_json.cc
@@ -250,12 +250,6 @@
               &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 @@
   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\": {";