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

Added dynamic Neon detect in isac-fix for Android NDK build, and thus fixed a build error in the last version.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/726004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2567 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org
2012-08-07 01:20:51 +00:00
parent 715509890c
commit f388fcc67e
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/audio_coding/codecs/iSAC/fix/source/filters_neon.c
View File

@@ -95,8 +95,8 @@ int WebRtcIsacfix_AutocorrNeon(
for (i = 1; i < order + 1; i++) { for (i = 1; i < order + 1; i++) {
int32_t prod_lower = 0; int32_t prod_lower = 0;
int32_t prod_upper = 0; int32_t prod_upper = 0;
int16_t* ptr0 = &x[0]; const int16_t* ptr0 = &x[0];
int16_t* ptr1 = &x[i]; const int16_t* ptr1 = &x[i];
int32_t tmp = 0; int32_t tmp = 0;
// Initialize the sum (q9) to zero. // Initialize the sum (q9) to zero.

26
src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
# #
# Use of this source code is governed by a BSD-style license # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source # that can be found in the LICENSE file in the root of the source
@@ -13,6 +13,7 @@
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@@ -63,16 +64,37 @@
'settings.h', 'settings.h',
'spectrum_ar_model_tables.h', 'spectrum_ar_model_tables.h',
'structs.h', 'structs.h',
], ],
'conditions': [ 'conditions': [
['OS!="win"', { ['OS!="win"', {
'defines': [ 'defines': [
'WEBRTC_LINUX', 'WEBRTC_LINUX',
], ],
}], }],
['OS=="android"', {
'dependencies': [ 'isac_neon', ],
}],
], ],
}, },
], ],
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'isac_neon',
'type': '<(library)',
'includes': ['../../../../../../build/arm_neon.gypi',],
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
],
'sources': [
'lattice_neon.S',
'filters_neon.c',
],
},
],
}],
],
} }
# Local Variables: # Local Variables: