From 711ccc8d96490f58cc3d7fd9207c19d4d881d4dc Mon Sep 17 00:00:00 2001 From: peah Date: Mon, 4 Apr 2016 22:57:45 -0700 Subject: [PATCH] Moved ring-buffer related files from common_audio to audio_processing BUG=webrtc:5724 NOPRESUBMIT=true Review URL: https://codereview.webrtc.org/1846903004 Cr-Commit-Position: refs/heads/master@{#12227} --- webrtc/common_audio/BUILD.gn | 8 -------- webrtc/common_audio/common_audio.gyp | 12 ------------ webrtc/modules/audio_processing/BUILD.gn | 8 ++++++++ webrtc/modules/audio_processing/aec/aec_core.cc | 4 +--- .../modules/audio_processing/aec/aec_core_internal.h | 7 ++++--- .../audio_processing/aec/echo_cancellation.cc | 4 +++- .../aec/echo_cancellation_internal.h | 6 +++--- webrtc/modules/audio_processing/aecm/aecm_core.c | 2 +- webrtc/modules/audio_processing/aecm/aecm_core.h | 2 +- webrtc/modules/audio_processing/aecm/aecm_core_c.c | 3 +-- .../audio_processing/aecm/echo_control_mobile.c | 2 +- .../modules/audio_processing/audio_processing.gypi | 8 ++++++++ .../beamformer/nonlinear_beamformer.h | 3 +-- .../intelligibility/intelligibility_enhancer.h | 2 +- .../audio_processing/utility}/audio_ring_buffer.cc | 4 ++-- .../audio_processing/utility}/audio_ring_buffer.h | 6 +++--- .../utility}/audio_ring_buffer_unittest.cc | 3 ++- .../audio_processing/utility}/blocker.cc | 2 +- .../audio_processing/utility}/blocker.h | 8 ++++---- .../audio_processing/utility}/blocker_unittest.cc | 2 +- .../audio_processing/utility}/lapped_transform.cc | 2 +- .../audio_processing/utility}/lapped_transform.h | 9 ++++----- .../utility}/lapped_transform_unittest.cc | 2 +- .../audio_processing/utility}/ring_buffer.c | 2 +- .../audio_processing/utility}/ring_buffer.h | 6 +++--- .../utility}/ring_buffer_unittest.cc | 2 +- webrtc/modules/modules.gyp | 4 ++++ 27 files changed, 61 insertions(+), 62 deletions(-) rename webrtc/{common_audio => modules/audio_processing/utility}/audio_ring_buffer.cc (94%) rename webrtc/{common_audio => modules/audio_processing/utility}/audio_ring_buffer.h (89%) rename webrtc/{common_audio => modules/audio_processing/utility}/audio_ring_buffer_unittest.cc (97%) rename webrtc/{common_audio => modules/audio_processing/utility}/blocker.cc (99%) rename webrtc/{common_audio => modules/audio_processing/utility}/blocker.h (94%) rename webrtc/{common_audio => modules/audio_processing/utility}/blocker_unittest.cc (99%) rename webrtc/{common_audio => modules/audio_processing/utility}/lapped_transform.cc (98%) rename webrtc/{common_audio => modules/audio_processing/utility}/lapped_transform.h (94%) rename webrtc/{common_audio => modules/audio_processing/utility}/lapped_transform_unittest.cc (98%) rename webrtc/{common_audio => modules/audio_processing/utility}/ring_buffer.c (99%) rename webrtc/{common_audio => modules/audio_processing/utility}/ring_buffer.h (92%) rename webrtc/{common_audio => modules/audio_processing/utility}/ring_buffer_unittest.cc (98%) diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn index b01b31816b..0103655ba9 100644 --- a/webrtc/common_audio/BUILD.gn +++ b/webrtc/common_audio/BUILD.gn @@ -21,11 +21,7 @@ source_set("common_audio") { sources = [ "audio_converter.cc", "audio_converter.h", - "audio_ring_buffer.cc", - "audio_ring_buffer.h", "audio_util.cc", - "blocker.cc", - "blocker.h", "channel_buffer.cc", "channel_buffer.h", "fft4g.c", @@ -35,8 +31,6 @@ source_set("common_audio") { "fir_filter_neon.h", "fir_filter_sse.h", "include/audio_util.h", - "lapped_transform.cc", - "lapped_transform.h", "real_fourier.cc", "real_fourier.h", "real_fourier_ooura.cc", @@ -49,8 +43,6 @@ source_set("common_audio") { "resampler/resampler.cc", "resampler/sinc_resampler.cc", "resampler/sinc_resampler.h", - "ring_buffer.c", - "ring_buffer.h", "signal_processing/auto_corr_to_refl_coef.c", "signal_processing/auto_correlation.c", "signal_processing/complex_fft_tables.h", diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 57d9f1ca64..e5a93798b5 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -31,11 +31,7 @@ 'sources': [ 'audio_converter.cc', 'audio_converter.h', - 'audio_ring_buffer.cc', - 'audio_ring_buffer.h', 'audio_util.cc', - 'blocker.cc', - 'blocker.h', 'channel_buffer.cc', 'channel_buffer.h', 'fft4g.c', @@ -45,8 +41,6 @@ 'fir_filter_neon.h', 'fir_filter_sse.h', 'include/audio_util.h', - 'lapped_transform.cc', - 'lapped_transform.h', 'real_fourier.cc', 'real_fourier.h', 'real_fourier_ooura.cc', @@ -59,8 +53,6 @@ 'resampler/resampler.cc', 'resampler/sinc_resampler.cc', 'resampler/sinc_resampler.h', - 'ring_buffer.c', - 'ring_buffer.h', 'signal_processing/include/real_fft.h', 'signal_processing/include/signal_processing_library.h', 'signal_processing/include/spl_inl.h', @@ -240,18 +232,14 @@ ], 'sources': [ 'audio_converter_unittest.cc', - 'audio_ring_buffer_unittest.cc', 'audio_util_unittest.cc', - 'blocker_unittest.cc', 'fir_filter_unittest.cc', - 'lapped_transform_unittest.cc', 'real_fourier_unittest.cc', 'resampler/resampler_unittest.cc', 'resampler/push_resampler_unittest.cc', 'resampler/push_sinc_resampler_unittest.cc', 'resampler/sinusoidal_linear_chirp_source.cc', 'resampler/sinusoidal_linear_chirp_source.h', - 'ring_buffer_unittest.cc', 'signal_processing/real_fft_unittest.cc', 'signal_processing/signal_processing_unittest.cc', 'sparse_fir_filter_unittest.cc', diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 22c904d52f..bf7bdc5d1c 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -108,13 +108,21 @@ source_set("audio_processing") { "transient/wpd_tree.h", "typing_detection.cc", "typing_detection.h", + "utility/audio_ring_buffer.cc", + "utility/audio_ring_buffer.h", "utility/block_mean_calculator.cc", "utility/block_mean_calculator.h", + "utility/blocker.cc", + "utility/blocker.h", "utility/delay_estimator.c", "utility/delay_estimator.h", "utility/delay_estimator_internal.h", "utility/delay_estimator_wrapper.c", "utility/delay_estimator_wrapper.h", + "utility/lapped_transform.cc", + "utility/lapped_transform.h", + "utility/ring_buffer.c", + "utility/ring_buffer.h", "vad/common.h", "vad/gmm.cc", "vad/gmm.h", diff --git a/webrtc/modules/audio_processing/aec/aec_core.cc b/webrtc/modules/audio_processing/aec/aec_core.cc index e23a79312b..4fe635d2db 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.cc +++ b/webrtc/modules/audio_processing/aec/aec_core.cc @@ -24,9 +24,6 @@ #include #include -extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -} #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/aec/aec_common.h" #include "webrtc/modules/audio_processing/aec/aec_core_internal.h" @@ -36,6 +33,7 @@ extern "C" { #include "webrtc/modules/audio_processing/logging/aec_logging.h" extern "C" { #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" } #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h index ea5889f503..1f4f99be63 100644 --- a/webrtc/modules/audio_processing/aec/aec_core_internal.h +++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h @@ -11,13 +11,14 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_ -extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -} #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/aec/aec_common.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" +extern "C" { +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" +} + #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.cc b/webrtc/modules/audio_processing/aec/echo_cancellation.cc index 32496ca33c..493068d9bf 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation.cc +++ b/webrtc/modules/audio_processing/aec/echo_cancellation.cc @@ -21,12 +21,14 @@ #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" } #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/aec/aec_resampler.h" #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" +extern "C" { +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" +} #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_internal.h b/webrtc/modules/audio_processing/aec/echo_cancellation_internal.h index b4a6fd8390..537ab5d904 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation_internal.h +++ b/webrtc/modules/audio_processing/aec/echo_cancellation_internal.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_INTERNAL_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_INTERNAL_H_ -extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -} #include "webrtc/modules/audio_processing/aec/aec_core.h" +extern "C" { +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" +} namespace webrtc { diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.c b/webrtc/modules/audio_processing/aecm/aecm_core.c index 6bf1cf7f3e..084feb858b 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core.c @@ -14,10 +14,10 @@ #include #include -#include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/real_fft.h" #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #include "webrtc/system_wrappers/include/compile_assert_c.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.h b/webrtc/modules/audio_processing/aecm/aecm_core.h index b52bb62d2d..9b70f47503 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core.h +++ b/webrtc/modules/audio_processing/aecm/aecm_core.h @@ -13,9 +13,9 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ -#include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/aecm/aecm_defines.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #include "webrtc/typedefs.h" #ifdef _MSC_VER // visual c++ diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.c b/webrtc/modules/audio_processing/aecm/aecm_core_c.c index 3a8fafa4ec..ea5f2bc8cf 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_c.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core_c.c @@ -14,10 +14,10 @@ #include #include -#include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/real_fft.h" #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #include "webrtc/system_wrappers/include/compile_assert_c.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" @@ -768,4 +768,3 @@ static void ComfortNoise(AecmCore* aecm, out[i].imag = WebRtcSpl_AddSatW16(out[i].imag, uImag[i]); } } - diff --git a/webrtc/modules/audio_processing/aecm/echo_control_mobile.c b/webrtc/modules/audio_processing/aecm/echo_control_mobile.c index 91e6f0e80c..d58ee3e456 100644 --- a/webrtc/modules/audio_processing/aecm/echo_control_mobile.c +++ b/webrtc/modules/audio_processing/aecm/echo_control_mobile.c @@ -15,9 +15,9 @@ #endif #include -#include "webrtc/common_audio/ring_buffer.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #define BUF_SIZE_FRAMES 50 // buffer size (frames) // Maximum length of resampled signal. Must be an integer multiple of frames diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index 264f3e5bef..75da59f3e0 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -118,13 +118,21 @@ 'transient/wpd_tree.h', 'typing_detection.cc', 'typing_detection.h', + 'utility/audio_ring_buffer.cc', + 'utility/audio_ring_buffer.h', 'utility/block_mean_calculator.cc', 'utility/block_mean_calculator.h', + 'utility/blocker.cc', + 'utility/blocker.h', 'utility/delay_estimator.c', 'utility/delay_estimator.h', 'utility/delay_estimator_internal.h', 'utility/delay_estimator_wrapper.c', 'utility/delay_estimator_wrapper.h', + 'utility/lapped_transform.cc', + 'utility/lapped_transform.h', + 'utility/ring_buffer.c', + 'utility/ring_buffer.h', 'vad/common.h', 'vad/gmm.cc', 'vad/gmm.h', diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h index b8953b0a4f..c1f9188bfc 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h @@ -19,11 +19,10 @@ #include #include -#include "webrtc/common_audio/lapped_transform.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/beamformer/beamformer.h" #include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" - +#include "webrtc/modules/audio_processing/utility/lapped_transform.h" namespace webrtc { // Enhances sound sources coming directly in front of a uniform linear array diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h index 1413212934..728e4cfb70 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h @@ -16,10 +16,10 @@ #include #include "webrtc/base/swap_queue.h" -#include "webrtc/common_audio/lapped_transform.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" +#include "webrtc/modules/audio_processing/utility/lapped_transform.h" #include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_ring_buffer.cc b/webrtc/modules/audio_processing/utility/audio_ring_buffer.cc similarity index 94% rename from webrtc/common_audio/audio_ring_buffer.cc rename to webrtc/modules/audio_processing/utility/audio_ring_buffer.cc index a29e53a61c..73f578f58b 100644 --- a/webrtc/common_audio/audio_ring_buffer.cc +++ b/webrtc/modules/audio_processing/utility/audio_ring_buffer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/audio_ring_buffer.h" +#include "webrtc/modules/audio_processing/utility/audio_ring_buffer.h" #include "webrtc/base/checks.h" -#include "webrtc/common_audio/ring_buffer.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" // This is a simple multi-channel wrapper over the ring_buffer.h C interface. diff --git a/webrtc/common_audio/audio_ring_buffer.h b/webrtc/modules/audio_processing/utility/audio_ring_buffer.h similarity index 89% rename from webrtc/common_audio/audio_ring_buffer.h rename to webrtc/modules/audio_processing/utility/audio_ring_buffer.h index ae825a3cd0..8f9758770e 100644 --- a/webrtc/common_audio/audio_ring_buffer.h +++ b/webrtc/modules/audio_processing/utility/audio_ring_buffer.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ -#define WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_AUDIO_RING_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_AUDIO_RING_BUFFER_H_ #include #include @@ -52,4 +52,4 @@ class AudioRingBuffer final { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_AUDIO_RING_BUFFER_H_ diff --git a/webrtc/common_audio/audio_ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc similarity index 97% rename from webrtc/common_audio/audio_ring_buffer_unittest.cc rename to webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc index c5c38de56d..c2d5e7a64c 100644 --- a/webrtc/common_audio/audio_ring_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc @@ -9,8 +9,9 @@ */ #include +#include -#include "webrtc/common_audio/audio_ring_buffer.h" +#include "webrtc/modules/audio_processing/utility/audio_ring_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_audio/channel_buffer.h" diff --git a/webrtc/common_audio/blocker.cc b/webrtc/modules/audio_processing/utility/blocker.cc similarity index 99% rename from webrtc/common_audio/blocker.cc rename to webrtc/modules/audio_processing/utility/blocker.cc index 13432f2e7a..a3661cc156 100644 --- a/webrtc/common_audio/blocker.cc +++ b/webrtc/modules/audio_processing/utility/blocker.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/blocker.h" +#include "webrtc/modules/audio_processing/utility/blocker.h" #include diff --git a/webrtc/common_audio/blocker.h b/webrtc/modules/audio_processing/utility/blocker.h similarity index 94% rename from webrtc/common_audio/blocker.h rename to webrtc/modules/audio_processing/utility/blocker.h index edf81d337a..7d9bf66e48 100644 --- a/webrtc/common_audio/blocker.h +++ b/webrtc/modules/audio_processing/utility/blocker.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_INTERNAL_BEAMFORMER_BLOCKER_H_ -#define WEBRTC_INTERNAL_BEAMFORMER_BLOCKER_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCKER_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCKER_H_ #include -#include "webrtc/common_audio/audio_ring_buffer.h" #include "webrtc/common_audio/channel_buffer.h" +#include "webrtc/modules/audio_processing/utility/audio_ring_buffer.h" namespace webrtc { @@ -121,4 +121,4 @@ class Blocker { } // namespace webrtc -#endif // WEBRTC_INTERNAL_BEAMFORMER_BLOCKER_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCKER_H_ diff --git a/webrtc/common_audio/blocker_unittest.cc b/webrtc/modules/audio_processing/utility/blocker_unittest.cc similarity index 99% rename from webrtc/common_audio/blocker_unittest.cc rename to webrtc/modules/audio_processing/utility/blocker_unittest.cc index eea3e2516a..3f53f68660 100644 --- a/webrtc/common_audio/blocker_unittest.cc +++ b/webrtc/modules/audio_processing/utility/blocker_unittest.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/common_audio/blocker.h" +#include "webrtc/modules/audio_processing/utility/blocker.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/arraysize.h" diff --git a/webrtc/common_audio/lapped_transform.cc b/webrtc/modules/audio_processing/utility/lapped_transform.cc similarity index 98% rename from webrtc/common_audio/lapped_transform.cc rename to webrtc/modules/audio_processing/utility/lapped_transform.cc index 0edf586d78..cb5496dfc4 100644 --- a/webrtc/common_audio/lapped_transform.cc +++ b/webrtc/modules/audio_processing/utility/lapped_transform.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/lapped_transform.h" +#include "webrtc/modules/audio_processing/utility/lapped_transform.h" #include #include diff --git a/webrtc/common_audio/lapped_transform.h b/webrtc/modules/audio_processing/utility/lapped_transform.h similarity index 94% rename from webrtc/common_audio/lapped_transform.h rename to webrtc/modules/audio_processing/utility/lapped_transform.h index 832735991b..1286ecf2d8 100644 --- a/webrtc/common_audio/lapped_transform.h +++ b/webrtc/modules/audio_processing/utility/lapped_transform.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ -#define WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_LAPPED_TRANSFORM_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_LAPPED_TRANSFORM_H_ #include #include -#include "webrtc/common_audio/blocker.h" #include "webrtc/common_audio/real_fourier.h" +#include "webrtc/modules/audio_processing/utility/blocker.h" #include "webrtc/system_wrappers/include/aligned_array.h" namespace webrtc { @@ -121,5 +121,4 @@ class LappedTransform { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ - +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_LAPPED_TRANSFORM_H_ diff --git a/webrtc/common_audio/lapped_transform_unittest.cc b/webrtc/modules/audio_processing/utility/lapped_transform_unittest.cc similarity index 98% rename from webrtc/common_audio/lapped_transform_unittest.cc rename to webrtc/modules/audio_processing/utility/lapped_transform_unittest.cc index a78488e326..f6c8ebd6d3 100644 --- a/webrtc/common_audio/lapped_transform_unittest.cc +++ b/webrtc/modules/audio_processing/utility/lapped_transform_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/lapped_transform.h" +#include "webrtc/modules/audio_processing/utility/lapped_transform.h" #include #include diff --git a/webrtc/common_audio/ring_buffer.c b/webrtc/modules/audio_processing/utility/ring_buffer.c similarity index 99% rename from webrtc/common_audio/ring_buffer.c rename to webrtc/modules/audio_processing/utility/ring_buffer.c index 60fb5dff20..c71bac1862 100644 --- a/webrtc/common_audio/ring_buffer.c +++ b/webrtc/modules/audio_processing/utility/ring_buffer.c @@ -11,7 +11,7 @@ // A ring buffer to hold arbitrary data. Provides no thread safety. Unless // otherwise specified, functions return 0 on success and -1 on error. -#include "webrtc/common_audio/ring_buffer.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #include // size_t #include diff --git a/webrtc/common_audio/ring_buffer.h b/webrtc/modules/audio_processing/utility/ring_buffer.h similarity index 92% rename from webrtc/common_audio/ring_buffer.h rename to webrtc/modules/audio_processing/utility/ring_buffer.h index 4125c48d01..a46c262229 100644 --- a/webrtc/common_audio/ring_buffer.h +++ b/webrtc/modules/audio_processing/utility/ring_buffer.h @@ -11,8 +11,8 @@ // A ring buffer to hold arbitrary data. Provides no thread safety. Unless // otherwise specified, functions return 0 on success and -1 on error. -#ifndef WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ -#define WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_RING_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_RING_BUFFER_H_ #ifdef __cplusplus extern "C" { @@ -63,4 +63,4 @@ size_t WebRtc_available_write(const RingBuffer* handle); } #endif -#endif // WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_RING_BUFFER_H_ diff --git a/webrtc/common_audio/ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc similarity index 98% rename from webrtc/common_audio/ring_buffer_unittest.cc rename to webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc index 92c470a02d..7972657727 100644 --- a/webrtc/common_audio/ring_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/ring_buffer.h" +#include "webrtc/modules/audio_processing/utility/ring_buffer.h" #include #include diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index d5df853905..eb886a9e4a 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -258,8 +258,12 @@ 'audio_processing/transient/transient_suppressor_unittest.cc', 'audio_processing/transient/wpd_node_unittest.cc', 'audio_processing/transient/wpd_tree_unittest.cc', + 'audio_processing/utility/audio_ring_buffer_unittest.cc', 'audio_processing/utility/block_mean_calculator_unittest.cc', + 'audio_processing/utility/blocker_unittest.cc', 'audio_processing/utility/delay_estimator_unittest.cc', + 'audio_processing/utility/lapped_transform_unittest.cc', + 'audio_processing/utility/ring_buffer_unittest.cc', 'audio_processing/vad/gmm_unittest.cc', 'audio_processing/vad/pitch_based_vad_unittest.cc', 'audio_processing/vad/pitch_internal_unittest.cc',