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

Change the dependency of ARM code from on Android to on ARM.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2699 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org 2012-09-03 21:22:28 +00:00
parent c81a801ed7
commit 9b1cf54a4a
7 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/common.gypi
View File

@ -64,10 +64,6 @@
'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
'conditions': [
['OS=="android"', {
# On Android, we always prefer fixed_point to reduce CPU usage.
'prefer_fixed_point%': 1,
}],
['build_with_chromium==1', {
# Exclude pulse audio on Chromium since its prerequisites don't require
# pulse audio.
@ -139,6 +135,7 @@
],
}],
['target_arch=="arm"', {
'prefer_fixed_point%': 1,
'defines': [
'WEBRTC_ARCH_ARM',
],
@ -191,6 +188,8 @@
'msvs_disabled_warnings!': [4189,],
}],
['OS=="android"', {
# TODO(kma): Remove prefer_fixed_point for Android.
'prefer_fixed_point%': 1,
'defines': [
'WEBRTC_LINUX',
'WEBRTC_ANDROID',

12
src/common_audio/signal_processing/signal_processing.gypi
View File

@ -57,13 +57,23 @@
'vector_scaling_operations.c',
],
'conditions': [
['OS=="android"', {
['target_arch=="arm"', {
'sources': [
'spl_sqrt_floor_arm.s',
],
'sources!': [
'spl_sqrt_floor.c',
],
'conditions': [
['armv7==1', {
'sources': [
'filter_ar_fast_q12_armv7.s',
],
'sources!': [
'filter_ar_fast_q12.c',
],
}],
],
}],
],
}, # spl

2
src/common_audio/signal_processing/signal_processing_unittest.cc
View File

@ -112,7 +112,7 @@ TEST_F(SplTest, MacroTest) {
WEBRTC_SPL_WORD32_MAX));
EXPECT_EQ(1073741824, WEBRTC_SPL_MUL_16_32_RSFT16(WEBRTC_SPL_WORD16_MIN,
WEBRTC_SPL_WORD32_MIN));
#ifdef WEBRTC_ARCH_ARM_V7A
#ifdef WEBRTC_ARCH_ARM_V7
EXPECT_EQ(-1073741824,
WEBRTC_SPL_MUL_16_32_RSFT16(WEBRTC_SPL_WORD16_MIN,
WEBRTC_SPL_WORD32_MAX));

4
src/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
View File

@ -72,7 +72,7 @@
'WEBRTC_LINUX',
],
}],
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'dependencies': [ 'isac_neon', ],
'sources': [
'lattice_armv7.S',
@ -87,7 +87,7 @@
},
],
'conditions': [
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'targets': [
{
'target_name': 'isac_neon',

2
src/modules/audio_coding/codecs/isac/fix/test/isacfix_unittest.cc
View File

@ -73,7 +73,7 @@ TEST_F(IsacUnitTest, HighpassFilterFixDec32Test) {
const int kSamples = 20;
int16_t in[kSamples];
int32_t state[2] = {12345, 987654};
#ifdef WEBRTC_ARCH_ARM_V7A
#ifdef WEBRTC_ARCH_ARM_V7
int32_t out[kSamples] = {-1040, -1035, -22875, -1397, -27604, 20018, 7917,
-1279, -8552, -14494, -7558, -23537, -27258, -30554, -32768, -3432, -32768,
25215, -27536, 22436};

4
src/modules/audio_processing/aecm/aecm.gypi
View File

@ -31,14 +31,14 @@
'aecm_core.h',
],
'conditions': [
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'dependencies': [ 'aecm_neon', ],
}],
],
},
],
'conditions': [
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'targets': [
{
'target_name': 'aecm_neon',

4
src/modules/audio_processing/ns/ns.gypi
View File

@ -55,14 +55,14 @@
'nsx_core.h',
],
'conditions': [
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'dependencies': [ 'ns_neon', ],
}],
],
},
],
'conditions': [
['OS=="android"', {
['target_arch=="arm" and armv7==1', {
'targets': [
{
'target_name': 'ns_neon',