zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge beamformer

Browse Source 
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
This commit is contained in:
aluebs@webrtc.org
2014-12-18 22:22:04 +00:00
parent 1090a6eccf
commit 0c39e91cc8
17 changed files with 2392 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/modules/audio_processing/audio_processing.gypi
View File

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