From 9b72af94cd61782ada88f777b07854daf9657bb2 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Wed, 11 Nov 2015 20:16:11 +0100 Subject: [PATCH] Remove webrtc/modules/audio_processing/{aec,aecm,ns}/include BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1440523002 . Cr-Commit-Position: refs/heads/master@{#10608} --- webrtc/modules/audio_processing/BUILD.gn | 8 ++++---- webrtc/modules/audio_processing/aec/echo_cancellation.c | 2 +- .../aec/{include => }/echo_cancellation.h | 6 +++--- .../audio_processing/aec/echo_cancellation_unittest.cc | 2 +- .../modules/audio_processing/aec/system_delay_unittest.cc | 2 +- webrtc/modules/audio_processing/aecm/aecm_core.c | 2 +- webrtc/modules/audio_processing/aecm/aecm_core_c.c | 2 +- webrtc/modules/audio_processing/aecm/aecm_core_mips.c | 2 +- .../modules/audio_processing/aecm/echo_control_mobile.c | 2 +- .../aecm/{include => }/echo_control_mobile.h | 6 +++--- webrtc/modules/audio_processing/audio_processing.gypi | 8 ++++---- webrtc/modules/audio_processing/echo_cancellation_impl.cc | 2 +- .../modules/audio_processing/echo_control_mobile_impl.cc | 2 +- webrtc/modules/audio_processing/noise_suppression_impl.cc | 4 ++-- webrtc/modules/audio_processing/ns/noise_suppression.c | 2 +- .../audio_processing/ns/{include => }/noise_suppression.h | 6 +++--- webrtc/modules/audio_processing/ns/noise_suppression_x.c | 2 +- .../ns/{include => }/noise_suppression_x.h | 6 +++--- webrtc/modules/audio_processing/ns/ns_core.c | 2 +- webrtc/modules/audio_processing/ns/nsx_core.c | 2 +- webrtc/modules/audio_processing/ns/nsx_core_c.c | 2 +- webrtc/modules/audio_processing/ns/nsx_core_mips.c | 2 +- 22 files changed, 37 insertions(+), 37 deletions(-) rename webrtc/modules/audio_processing/aec/{include => }/echo_cancellation.h (97%) rename webrtc/modules/audio_processing/aecm/{include => }/echo_control_mobile.h (97%) rename webrtc/modules/audio_processing/ns/{include => }/noise_suppression.h (93%) rename webrtc/modules/audio_processing/ns/{include => }/noise_suppression_x.h (91%) diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 2d0c602ef0..9d91911bc2 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -30,12 +30,12 @@ source_set("audio_processing") { "aec/aec_resampler.c", "aec/aec_resampler.h", "aec/echo_cancellation.c", + "aec/echo_cancellation.h", "aec/echo_cancellation_internal.h", - "aec/include/echo_cancellation.h", "aecm/aecm_core.c", "aecm/aecm_core.h", "aecm/echo_control_mobile.c", - "aecm/include/echo_control_mobile.h", + "aecm/echo_control_mobile.h", "agc/agc.cc", "agc/agc.h", "agc/agc_manager_direct.cc", @@ -161,8 +161,8 @@ source_set("audio_processing") { if (rtc_prefer_fixed_point) { defines += [ "WEBRTC_NS_FIXED" ] sources += [ - "ns/include/noise_suppression_x.h", "ns/noise_suppression_x.c", + "ns/noise_suppression_x.h", "ns/nsx_core.c", "ns/nsx_core.h", "ns/nsx_defines.h", @@ -176,8 +176,8 @@ source_set("audio_processing") { defines += [ "WEBRTC_NS_FLOAT" ] sources += [ "ns/defines.h", - "ns/include/noise_suppression.h", "ns/noise_suppression.c", + "ns/noise_suppression.h", "ns/ns_core.c", "ns/ns_core.h", "ns/windows_private.h", diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c index 175ef3d798..cf38c67b4d 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation.c +++ b/webrtc/modules/audio_processing/aec/echo_cancellation.c @@ -11,7 +11,7 @@ /* * Contains the API functions for the AEC. */ -#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" +#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include #ifdef WEBRTC_AEC_DEBUG_DUMP diff --git a/webrtc/modules/audio_processing/aec/include/echo_cancellation.h b/webrtc/modules/audio_processing/aec/echo_cancellation.h similarity index 97% rename from webrtc/modules/audio_processing/aec/include/echo_cancellation.h rename to webrtc/modules/audio_processing/aec/echo_cancellation.h index 90a248f0b6..de84b2e6d1 100644 --- a/webrtc/modules/audio_processing/aec/include/echo_cancellation.h +++ b/webrtc/modules/audio_processing/aec/echo_cancellation.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_INCLUDE_ECHO_CANCELLATION_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_INCLUDE_ECHO_CANCELLATION_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ #include @@ -248,4 +248,4 @@ struct AecCore* WebRtcAec_aec_core(void* handle); #ifdef __cplusplus } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_INCLUDE_ECHO_CANCELLATION_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc index 315ac3e9f9..42db082ff9 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc +++ b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc @@ -10,7 +10,7 @@ // TODO(bjornv): Make this a comprehensive test. -#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" +#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include #include diff --git a/webrtc/modules/audio_processing/aec/system_delay_unittest.cc b/webrtc/modules/audio_processing/aec/system_delay_unittest.cc index 07e3cf8add..32f5a3e6e2 100644 --- a/webrtc/modules/audio_processing/aec/system_delay_unittest.cc +++ b/webrtc/modules/audio_processing/aec/system_delay_unittest.cc @@ -13,7 +13,7 @@ extern "C" { #include "webrtc/modules/audio_processing/aec/aec_core.h" } #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" -#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" +#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.c b/webrtc/modules/audio_processing/aecm/aecm_core.c index f0d85d5328..6bf1cf7f3e 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core.c @@ -16,7 +16,7 @@ #include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" +#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" #include "webrtc/system_wrappers/include/compile_assert_c.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.c b/webrtc/modules/audio_processing/aecm/aecm_core_c.c index df95e8bedf..3a8fafa4ec 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_c.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core_c.c @@ -16,7 +16,7 @@ #include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" +#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" #include "webrtc/system_wrappers/include/compile_assert_c.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_mips.c b/webrtc/modules/audio_processing/aecm/aecm_core_mips.c index 3c2343a892..3ca9982ebf 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_mips.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core_mips.c @@ -12,7 +12,7 @@ #include -#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" +#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { diff --git a/webrtc/modules/audio_processing/aecm/echo_control_mobile.c b/webrtc/modules/audio_processing/aecm/echo_control_mobile.c index f59cd125f2..91e6f0e80c 100644 --- a/webrtc/modules/audio_processing/aecm/echo_control_mobile.c +++ b/webrtc/modules/audio_processing/aecm/echo_control_mobile.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" +#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #ifdef AEC_DEBUG #include diff --git a/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h b/webrtc/modules/audio_processing/aecm/echo_control_mobile.h similarity index 97% rename from webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h rename to webrtc/modules/audio_processing/aecm/echo_control_mobile.h index b29f078bf7..b45ff59907 100644 --- a/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h +++ b/webrtc/modules/audio_processing/aecm/echo_control_mobile.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_INCLUDE_ECHO_CONTROL_MOBILE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_INCLUDE_ECHO_CONTROL_MOBILE_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ #include @@ -206,4 +206,4 @@ size_t WebRtcAecm_echo_path_size_bytes(); #ifdef __cplusplus } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AECM_INCLUDE_ECHO_CONTROL_MOBILE_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index 8f1fbdf0be..7ddd4f5a15 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -41,11 +41,11 @@ 'aec/aec_resampler.h', 'aec/echo_cancellation.c', 'aec/echo_cancellation_internal.h', - 'aec/include/echo_cancellation.h', + 'aec/echo_cancellation.h', 'aecm/aecm_core.c', 'aecm/aecm_core.h', 'aecm/echo_control_mobile.c', - 'aecm/include/echo_control_mobile.h', + 'aecm/echo_control_mobile.h', 'agc/agc.cc', 'agc/agc.h', 'agc/agc_manager_direct.cc', @@ -162,7 +162,7 @@ ['prefer_fixed_point==1', { 'defines': ['WEBRTC_NS_FIXED'], 'sources': [ - 'ns/include/noise_suppression_x.h', + 'ns/noise_suppression_x.h', 'ns/noise_suppression_x.c', 'ns/nsx_core.c', 'ns/nsx_core.h', @@ -183,7 +183,7 @@ 'defines': ['WEBRTC_NS_FLOAT'], 'sources': [ 'ns/defines.h', - 'ns/include/noise_suppression.h', + 'ns/noise_suppression.h', 'ns/noise_suppression.c', 'ns/ns_core.c', 'ns/ns_core.h', diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc index 0de5e620ce..0343a0eb44 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc @@ -16,7 +16,7 @@ extern "C" { #include "webrtc/modules/audio_processing/aec/aec_core.h" } -#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" +#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc index 7466d006d8..8cc9dce27e 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" +#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/logging.h" diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc index 65ec3c445e..84481f6083 100644 --- a/webrtc/modules/audio_processing/noise_suppression_impl.cc +++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc @@ -14,9 +14,9 @@ #include "webrtc/modules/audio_processing/audio_buffer.h" #if defined(WEBRTC_NS_FLOAT) -#include "webrtc/modules/audio_processing/ns/include/noise_suppression.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression.h" #elif defined(WEBRTC_NS_FIXED) -#include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" #endif #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/audio_processing/ns/noise_suppression.c b/webrtc/modules/audio_processing/ns/noise_suppression.c index 13f1b2d6dc..dd05e0ab3d 100644 --- a/webrtc/modules/audio_processing/ns/noise_suppression.c +++ b/webrtc/modules/audio_processing/ns/noise_suppression.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/include/noise_suppression.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression.h" #include #include diff --git a/webrtc/modules/audio_processing/ns/include/noise_suppression.h b/webrtc/modules/audio_processing/ns/noise_suppression.h similarity index 93% rename from webrtc/modules/audio_processing/ns/include/noise_suppression.h rename to webrtc/modules/audio_processing/ns/noise_suppression.h index 9dac56bdee..8018118b60 100644 --- a/webrtc/modules/audio_processing/ns/include/noise_suppression.h +++ b/webrtc/modules/audio_processing/ns/noise_suppression.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ #include @@ -113,4 +113,4 @@ float WebRtcNs_prior_speech_probability(NsHandle* handle); } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ diff --git a/webrtc/modules/audio_processing/ns/noise_suppression_x.c b/webrtc/modules/audio_processing/ns/noise_suppression_x.c index 150fe608dd..0a5ba13300 100644 --- a/webrtc/modules/audio_processing/ns/noise_suppression_x.c +++ b/webrtc/modules/audio_processing/ns/noise_suppression_x.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" #include diff --git a/webrtc/modules/audio_processing/ns/include/noise_suppression_x.h b/webrtc/modules/audio_processing/ns/noise_suppression_x.h similarity index 91% rename from webrtc/modules/audio_processing/ns/include/noise_suppression_x.h rename to webrtc/modules/audio_processing/ns/noise_suppression_x.h index 88fe4cd635..02b44cc091 100644 --- a/webrtc/modules/audio_processing/ns/include/noise_suppression_x.h +++ b/webrtc/modules/audio_processing/ns/noise_suppression_x.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_X_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_X_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ #include "webrtc/typedefs.h" @@ -85,4 +85,4 @@ void WebRtcNsx_Process(NsxHandle* nsxInst, } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_INCLUDE_NOISE_SUPPRESSION_X_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ diff --git a/webrtc/modules/audio_processing/ns/ns_core.c b/webrtc/modules/audio_processing/ns/ns_core.c index 1d6091400e..5ce64cee29 100644 --- a/webrtc/modules/audio_processing/ns/ns_core.c +++ b/webrtc/modules/audio_processing/ns/ns_core.c @@ -15,7 +15,7 @@ #include "webrtc/common_audio/fft4g.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/ns/include/noise_suppression.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression.h" #include "webrtc/modules/audio_processing/ns/ns_core.h" #include "webrtc/modules/audio_processing/ns/windows_private.h" diff --git a/webrtc/modules/audio_processing/ns/nsx_core.c b/webrtc/modules/audio_processing/ns/nsx_core.c index 71445792f5..25f16d26ab 100644 --- a/webrtc/modules/audio_processing/ns/nsx_core.c +++ b/webrtc/modules/audio_processing/ns/nsx_core.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" #include #include diff --git a/webrtc/modules/audio_processing/ns/nsx_core_c.c b/webrtc/modules/audio_processing/ns/nsx_core_c.c index 14322d38cc..da7aa3d5db 100644 --- a/webrtc/modules/audio_processing/ns/nsx_core_c.c +++ b/webrtc/modules/audio_processing/ns/nsx_core_c.c @@ -10,7 +10,7 @@ #include -#include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" #include "webrtc/modules/audio_processing/ns/nsx_core.h" #include "webrtc/modules/audio_processing/ns/nsx_defines.h" diff --git a/webrtc/modules/audio_processing/ns/nsx_core_mips.c b/webrtc/modules/audio_processing/ns/nsx_core_mips.c index d99be8720b..7688d82d78 100644 --- a/webrtc/modules/audio_processing/ns/nsx_core_mips.c +++ b/webrtc/modules/audio_processing/ns/nsx_core_mips.c @@ -11,7 +11,7 @@ #include #include -#include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" +#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" #include "webrtc/modules/audio_processing/ns/nsx_core.h" static const int16_t kIndicatorTable[17] = {