From e156287855e0a3d9b72b8b5ad557d0e5f3eed939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Thu, 9 Apr 2020 13:12:08 +0200 Subject: [PATCH] AEC3: Remove deprecated parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8671 Change-Id: Ia9bcfef9d626729b79fdcce5e8df82bf020dc9af Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173321 Reviewed-by: Sam Zackrisson Reviewed-by: Karl Wiberg Commit-Queue: Per Åhgren Cr-Commit-Position: refs/heads/master@{#31042} --- api/audio/echo_canceller3_config.h | 3 --- api/audio/echo_canceller3_config_json.cc | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h index 53408e4de4..a505625538 100644 --- a/api/audio/echo_canceller3_config.h +++ b/api/audio/echo_canceller3_config.h @@ -90,9 +90,6 @@ struct RTC_EXPORT EchoCanceller3Config { bool enable_coarse_filter_output_usage = true; bool use_linear_filter = true; bool export_linear_aec_output = false; - // Deprecated. - // TODO(peah): Remove. - bool use_legacy_filter_naming = false; } filter; struct Erle { diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc index 088c43439b..f5c1249674 100644 --- a/api/audio/echo_canceller3_config_json.cc +++ b/api/audio/echo_canceller3_config_json.cc @@ -230,8 +230,6 @@ void Aec3ConfigFromJsonString(absl::string_view json_string, ReadParam(section, "use_linear_filter", &cfg.filter.use_linear_filter); ReadParam(section, "export_linear_aec_output", &cfg.filter.export_linear_aec_output); - ReadParam(section, "use_legacy_filter_naming", - &cfg.filter.use_legacy_filter_naming); } if (rtc::GetValueFromJsonObject(aec3_root, "erle", §ion)) { @@ -508,9 +506,7 @@ std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) { ost << "\"use_linear_filter\": " << (config.filter.use_linear_filter ? "true" : "false") << ","; ost << "\"export_linear_aec_output\": " - << (config.filter.export_linear_aec_output ? "true" : "false") << ","; - ost << "\"use_legacy_filter_naming\": " - << (config.filter.use_legacy_filter_naming ? "true" : "false"); + << (config.filter.export_linear_aec_output ? "true" : "false"); ost << "},";