From 89aaedac1263fd69c82bb750ec06b00820e9546f Mon Sep 17 00:00:00 2001
From: Daniel Johansson <dajo@webrtc.org>
Date: Tue, 10 Dec 2019 11:00:38 +0100
Subject: [PATCH] Move audioproc_f to rtc_tools.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The motivation in https://webrtc-review.googlesource.com/c/src/+/32340/3 applies here as well. We
would like to use this tool downstream.

Bug: None
Change-Id: Id5b23f792679ab9c07294bfb8e53119c423044b1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161681
Commit-Queue: Daniel Johansson <dajo@webrtc.org>
Reviewed-by: Daniel Johansson <dajo@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30051}
---
 modules/audio_processing/BUILD.gn                  | 13 -------------
 .../test/py_quality_assessment/BUILD.gn            |  2 +-
 rtc_tools/BUILD.gn                                 | 14 ++++++++++++++
 .../audioproc_f}/audioproc_float_main.cc           |  0
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename {modules/audio_processing/test => rtc_tools/audioproc_f}/audioproc_float_main.cc (100%)

diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index f347b04279..dfbe9ff3ae 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -368,7 +368,6 @@ if (rtc_include_tests) {
 
     if (rtc_enable_protobuf) {
       deps += [
-        ":audioproc_f",
         ":audioproc_unittest_proto",
         "aec_dump:aec_dump_unittests",
         "test/conversational_speech",
@@ -604,18 +603,6 @@ if (rtc_include_tests) {
         "//third_party/abseil-cpp/absl/types:optional",
       ]
     }  # audioproc_f_impl
-    rtc_executable("audioproc_f") {
-      testonly = true
-      sources = [
-        "test/audioproc_float_main.cc",
-      ]
-      deps = [
-        ":api",
-        ":audio_processing",
-        "../../api:audioproc_f_api",
-        "../../rtc_base:rtc_base_approved",
-      ]
-    }  # audioproc_f
   }
 
   rtc_library("audioproc_test_utils") {
diff --git a/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
index 728e2b3361..7bfa9a63eb 100644
--- a/modules/audio_processing/test/py_quality_assessment/BUILD.gn
+++ b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
@@ -34,8 +34,8 @@ copy("scripts") {
     ":apm_configs",
     ":lib",
     ":output",
-    "../..:audioproc_f",
     "../../../../resources/audio_processing/test/py_quality_assessment:probing_signals",
+    "../../../../rtc_tools:audioproc_f",
   ]
 }
 
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 00528a40c3..bd4d5ad4d5 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -36,6 +36,7 @@ group("rtc_tools") {
         deps += [ ":event_log_visualizer" ]
       }
       deps += [
+        ":audioproc_f",
         ":rtp_analyzer",
         ":unpack_aecdump",
         "network_tester",
@@ -413,6 +414,19 @@ if (rtc_include_tests) {
   }
 
   if (rtc_enable_protobuf) {
+    rtc_executable("audioproc_f") {
+      testonly = true
+      sources = [
+        "audioproc_f/audioproc_float_main.cc",
+      ]
+      deps = [
+        "../api:audioproc_f_api",
+        "../modules/audio_processing",
+        "../modules/audio_processing:api",
+        "../rtc_base:rtc_base_approved",
+      ]
+    }
+
     copy("rtp_analyzer") {
       sources = [
         "py_event_log_analyzer/misc.py",
diff --git a/modules/audio_processing/test/audioproc_float_main.cc b/rtc_tools/audioproc_f/audioproc_float_main.cc
similarity index 100%
rename from modules/audio_processing/test/audioproc_float_main.cc
rename to rtc_tools/audioproc_f/audioproc_float_main.cc