Merge beamformer
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/34529004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7958 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi
index 70c549c..a2c26a3 100644
--- a/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/webrtc/modules/audio_processing/audio_processing.gypi
@@ -8,12 +8,6 @@
{
'variables': {
- 'audio_processing_dependencies': [
- '<(webrtc_root)/base/base.gyp:rtc_base_approved',
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/modules/modules.gyp:iSAC',
- '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
},
'targets': [
@@ -31,7 +25,10 @@
'aec_untrusted_delay_for_testing%': 0,
},
'dependencies': [
- '<@(audio_processing_dependencies)',
+ '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
+ '<(webrtc_root)/modules/modules.gyp:iSAC',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'aec/aec_core.c',
@@ -84,6 +81,10 @@
'audio_buffer.h',
'audio_processing_impl.cc',
'audio_processing_impl.h',
+ 'beamformer/complex_matrix.h',
+ 'beamformer/covariance_matrix_generator.cc',
+ 'beamformer/covariance_matrix_generator.h',
+ 'beamformer/matrix.h',
'channel_buffer.cc',
'channel_buffer.h',
'common.h',
@@ -178,6 +179,12 @@
'ns/windows_private.h',
],
}],
+ ['rtc_use_openmax_dl==1', {
+ 'sources': [
+ 'beamformer/beamformer.cc',
+ 'beamformer/beamformer.h',
+ ],
+ }],
['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['audio_processing_sse2',],
}],