From 035e9123e9c7de3b09b37bc8e57907e4af7ce219 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 28 Jan 2015 19:57:00 +0000 Subject: [PATCH] Move channel_buffer.{h,cc} to common_audio. In https://code.google.com/p/webrtc/source/detail?r=8166 I added a check preventing GYP files from referencing sources above their directory level. This CL fixes the disallowed reference added in https://code.google.com/p/webrtc/source/detail?r=8157 by moving channel_buffer.{h,cc} to common_audio for real. BUG=4185 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/35939004 Cr-Commit-Position: refs/heads/master@{#8190} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8190 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_audio/BUILD.gn | 4 ++-- webrtc/common_audio/audio_converter.h | 2 +- webrtc/common_audio/audio_converter_unittest.cc | 2 +- webrtc/common_audio/audio_ring_buffer_unittest.cc | 2 +- webrtc/common_audio/blocker.h | 2 +- .../audio_processing => common_audio}/channel_buffer.cc | 2 +- .../audio_processing => common_audio}/channel_buffer.h | 0 webrtc/common_audio/common_audio.gyp | 4 ++-- webrtc/modules/audio_processing/audio_buffer.cc | 2 +- webrtc/modules/audio_processing/audio_buffer.h | 2 +- webrtc/modules/audio_processing/audio_processing_impl.cc | 2 +- webrtc/modules/audio_processing/beamformer/complex_matrix.h | 2 +- webrtc/modules/audio_processing/beamformer/matrix.h | 2 +- webrtc/modules/audio_processing/beamformer/pcm_utils.cc | 2 +- webrtc/modules/audio_processing/splitting_filter.cc | 2 +- webrtc/modules/audio_processing/splitting_filter_unittest.cc | 2 +- webrtc/modules/audio_processing/test/audioproc_float.cc | 2 +- webrtc/modules/audio_processing/test/test_utils.h | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename webrtc/{modules/audio_processing => common_audio}/channel_buffer.cc (96%) rename webrtc/{modules/audio_processing => common_audio}/channel_buffer.h (100%) diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn index 81df70cd6..4a21da043 100644 --- a/webrtc/common_audio/BUILD.gn +++ b/webrtc/common_audio/BUILD.gn @@ -19,8 +19,8 @@ config("common_audio_config") { source_set("common_audio") { sources = [ - "../modules/audio_processing/channel_buffer.cc", - "../modules/audio_processing/channel_buffer.h", + "channel_buffer.cc", + "channel_buffer.h", "audio_converter.cc", "audio_converter.h", "audio_ring_buffer.cc", diff --git a/webrtc/common_audio/audio_converter.h b/webrtc/common_audio/audio_converter.h index c71a3fdcc..564eda1f0 100644 --- a/webrtc/common_audio/audio_converter.h +++ b/webrtc/common_audio/audio_converter.h @@ -13,7 +13,7 @@ // TODO(ajm): Move channel buffer to common_audio. #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_vector.h" diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/webrtc/common_audio/audio_converter_unittest.cc index 3e509ceb0..435f928be 100644 --- a/webrtc/common_audio/audio_converter_unittest.cc +++ b/webrtc/common_audio/audio_converter_unittest.cc @@ -15,7 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_audio/audio_converter.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_ring_buffer_unittest.cc b/webrtc/common_audio/audio_ring_buffer_unittest.cc index 3671ce4df..582d981c0 100644 --- a/webrtc/common_audio/audio_ring_buffer_unittest.cc +++ b/webrtc/common_audio/audio_ring_buffer_unittest.cc @@ -11,7 +11,7 @@ #include "webrtc/common_audio/audio_ring_buffer.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/common_audio/blocker.h b/webrtc/common_audio/blocker.h index 5809d570a..3c4cf81c7 100644 --- a/webrtc/common_audio/blocker.h +++ b/webrtc/common_audio/blocker.h @@ -12,7 +12,7 @@ #define WEBRTC_INTERNAL_BEAMFORMER_BLOCKER_H_ #include "webrtc/common_audio/audio_ring_buffer.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/channel_buffer.cc b/webrtc/common_audio/channel_buffer.cc similarity index 96% rename from webrtc/modules/audio_processing/channel_buffer.cc rename to webrtc/common_audio/channel_buffer.cc index 0126ea137..9c0755017 100644 --- a/webrtc/modules/audio_processing/channel_buffer.cc +++ b/webrtc/common_audio/channel_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/channel_buffer.h b/webrtc/common_audio/channel_buffer.h similarity index 100% rename from webrtc/modules/audio_processing/channel_buffer.h rename to webrtc/common_audio/channel_buffer.h diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 55ba05cdc..f74a5b194 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -29,8 +29,8 @@ ], }, 'sources': [ - '../modules/audio_processing/channel_buffer.cc', - '../modules/audio_processing/channel_buffer.h', + 'channel_buffer.cc', + 'channel_buffer.h', 'audio_converter.cc', 'audio_converter.h', 'audio_ring_buffer.cc', diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/webrtc/modules/audio_processing/audio_buffer.cc index 8f164efaa..7b302cff0 100644 --- a/webrtc/modules/audio_processing/audio_buffer.cc +++ b/webrtc/modules/audio_processing/audio_buffer.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/resampler/push_sinc_resampler.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/common.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/webrtc/modules/audio_processing/audio_buffer.h index a526ca07c..da4f7e8f2 100644 --- a/webrtc/modules/audio_processing/audio_buffer.h +++ b/webrtc/modules/audio_processing/audio_buffer.h @@ -14,7 +14,7 @@ #include #include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/splitting_filter.h" #include "webrtc/modules/interface/module_common_types.h" diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 2fa6f28be..7eeda111a 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/beamformer/beamformer.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/common.h" #include "webrtc/modules/audio_processing/echo_cancellation_impl.h" #include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" diff --git a/webrtc/modules/audio_processing/beamformer/complex_matrix.h b/webrtc/modules/audio_processing/beamformer/complex_matrix.h index 0e7ee1475..a726224de 100644 --- a/webrtc/modules/audio_processing/beamformer/complex_matrix.h +++ b/webrtc/modules/audio_processing/beamformer/complex_matrix.h @@ -14,7 +14,7 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/beamformer/matrix.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/audio_processing/beamformer/matrix.h b/webrtc/modules/audio_processing/beamformer/matrix.h index 1cb475c2e..e1891b6c4 100644 --- a/webrtc/modules/audio_processing/beamformer/matrix.h +++ b/webrtc/modules/audio_processing/beamformer/matrix.h @@ -17,7 +17,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace { diff --git a/webrtc/modules/audio_processing/beamformer/pcm_utils.cc b/webrtc/modules/audio_processing/beamformer/pcm_utils.cc index 41d729e56..14d974233 100644 --- a/webrtc/modules/audio_processing/beamformer/pcm_utils.cc +++ b/webrtc/modules/audio_processing/beamformer/pcm_utils.cc @@ -12,7 +12,7 @@ #include "webrtc/base/checks.h" #include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/splitting_filter.cc b/webrtc/modules/audio_processing/splitting_filter.cc index adb82f60d..f3cbcadfb 100644 --- a/webrtc/modules/audio_processing/splitting_filter.cc +++ b/webrtc/modules/audio_processing/splitting_filter.cc @@ -13,7 +13,7 @@ #include "webrtc/base/checks.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/splitting_filter_unittest.cc b/webrtc/modules/audio_processing/splitting_filter_unittest.cc index 270b3f9d9..105392d8d 100644 --- a/webrtc/modules/audio_processing/splitting_filter_unittest.cc +++ b/webrtc/modules/audio_processing/splitting_filter_unittest.cc @@ -14,7 +14,7 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/splitting_filter.h" #include "webrtc/common_audio/include/audio_util.h" diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc index 83e9a88bd..f8059de6b 100644 --- a/webrtc/modules/audio_processing/test/audioproc_float.cc +++ b/webrtc/modules/audio_processing/test/audioproc_float.cc @@ -13,8 +13,8 @@ #include "gflags/gflags.h" #include "webrtc/base/checks.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/audio_processing/test/test_utils.h b/webrtc/modules/audio_processing/test/test_utils.h index 2243590bb..0bf6f27d6 100644 --- a/webrtc/modules/audio_processing/test/test_utils.h +++ b/webrtc/modules/audio_processing/test/test_utils.h @@ -12,9 +12,9 @@ #include #include "webrtc/audio_processing/debug.pb.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/channel_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"