From fd4ce5042384d367e6e1792d69fe11515c939d23 Mon Sep 17 00:00:00 2001
From: Gustaf Ullberg <gustaf@webrtc.org>
Date: Thu, 15 Feb 2018 10:09:09 +0100
Subject: [PATCH] Move echo_control.h to api/audio

Bug: webrtc:8844
Change-Id: I5c2406c43ade786c26e12b3c847fed8424283df0
Reviewed-on: https://webrtc-review.googlesource.com/53700
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22031}
---
 api/BUILD.gn                                             | 9 +++++++++
 .../include => api/audio}/echo_control.h                 | 6 +++---
 modules/audio_processing/BUILD.gn                        | 2 +-
 modules/audio_processing/aec3/echo_remover.h             | 2 +-
 modules/audio_processing/include/audio_processing.h      | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)
 rename {modules/audio_processing/include => api/audio}/echo_control.h (88%)

diff --git a/api/BUILD.gn b/api/BUILD.gn
index 4b7413338f..d55fd46de8 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -228,6 +228,15 @@ rtc_source_set("aec3_config") {
   deps = []
 }
 
+rtc_source_set("echo_control") {
+  visibility = [ "*" ]
+  sources = [
+    "audio/echo_control.h",
+  ]
+
+  deps = []
+}
+
 rtc_source_set("audio_options_api") {
   visibility = [ "*" ]
   sources = [
diff --git a/modules/audio_processing/include/echo_control.h b/api/audio/echo_control.h
similarity index 88%
rename from modules/audio_processing/include/echo_control.h
rename to api/audio/echo_control.h
index 7fe4f3bbda..021bbf8764 100644
--- a/modules/audio_processing/include/echo_control.h
+++ b/api/audio/echo_control.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_ECHO_CONTROL_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_ECHO_CONTROL_H_
+#ifndef API_AUDIO_ECHO_CONTROL_H_
+#define API_AUDIO_ECHO_CONTROL_H_
 
 #include <memory>
 
@@ -49,4 +49,4 @@ class EchoControlFactory {
 };
 }  // namespace webrtc
 
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_ECHO_CONTROL_H_
+#endif  // API_AUDIO_ECHO_CONTROL_H_
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index b2b952cb27..ba0cf9900d 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -155,7 +155,6 @@ rtc_static_library("audio_processing") {
     "include/audio_processing.h",
     "include/config.cc",
     "include/config.h",
-    "include/echo_control.h",
     "level_controller/biquad_filter.cc",
     "level_controller/biquad_filter.h",
     "level_controller/down_sampler.cc",
@@ -223,6 +222,7 @@ rtc_static_library("audio_processing") {
     "../../:typedefs",
     "../../api:aec3_config",
     "../../api:array_view",
+    "../../api:echo_control",
     "../../api:optional",
     "../../audio/utility:audio_frame_operations",
     "../../common_audio:common_audio_c",
diff --git a/modules/audio_processing/aec3/echo_remover.h b/modules/audio_processing/aec3/echo_remover.h
index 8e5663cbb1..ca83e76b0b 100644
--- a/modules/audio_processing/aec3/echo_remover.h
+++ b/modules/audio_processing/aec3/echo_remover.h
@@ -14,10 +14,10 @@
 #include <vector>
 
 #include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
 #include "api/optional.h"
 #include "modules/audio_processing/aec3/echo_path_variability.h"
 #include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/include/audio_processing.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 457d97a000..50ec43020d 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -23,11 +23,11 @@
 #include <vector>
 
 #include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
 #include "api/optional.h"
 #include "modules/audio_processing/beamformer/array_util.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "modules/audio_processing/include/config.h"
-#include "modules/audio_processing/include/echo_control.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/platform_file.h"