generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move channel_buffer.{h,cc} to common_audio.

Browse Source 
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
This commit is contained in:
kjellander@webrtc.org 2015-01-28 19:57:00 +00:00
parent a67ca1a3bb
commit 035e9123e9
18 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/common_audio/BUILD.gn
View File

@ -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",

2
webrtc/common_audio/audio_converter.h
View File

@ -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"

2
webrtc/common_audio/audio_converter_unittest.cc
View File

@ -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 {

2
webrtc/common_audio/audio_ring_buffer_unittest.cc
View File

@ -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 {

2
webrtc/common_audio/blocker.h
View File

@ -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 {

2
webrtc/modules/audio_processing/channel_buffer.cc → webrtc/common_audio/channel_buffer.cc
View File

@ -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 {

0
webrtc/modules/audio_processing/channel_buffer.h → webrtc/common_audio/channel_buffer.h
View File

4
webrtc/common_audio/common_audio.gyp
View File

@ -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',

2
webrtc/modules/audio_processing/audio_buffer.cc
View File

@ -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 {

2
webrtc/modules/audio_processing/audio_buffer.h
View File

@ -14,7 +14,7 @@
#include <vector>
#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"

2
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -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"

2
webrtc/modules/audio_processing/beamformer/complex_matrix.h
View File

@ -14,7 +14,7 @@
#include <complex>
#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"

2
webrtc/modules/audio_processing/beamformer/matrix.h
View File

@ -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 {

2
webrtc/modules/audio_processing/beamformer/pcm_utils.cc
View File

@ -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 {

2
webrtc/modules/audio_processing/splitting_filter.cc
View File

@ -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 {

2
webrtc/modules/audio_processing/splitting_filter_unittest.cc
View File

@ -14,7 +14,7 @@
#include <math.h>
#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"

2
webrtc/modules/audio_processing/test/audioproc_float.cc
View File

@ -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"

2
webrtc/modules/audio_processing/test/test_utils.h
View File

@ -12,9 +12,9 @@
#include <limits>
#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"