From 073dd7b423157020846872ca2398cc86d3ca9508 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 11 Feb 2015 17:02:52 +0000 Subject: [PATCH] WebRtc_GetCPUFeaturesARM is only available on android R=andrew@webrtc.org, jridges@masque.com, zhongwei.yao@arm.com Review URL: https://webrtc-codereview.appspot.com/35119004 Patch from Mostyn Bramley-Moore . Cr-Commit-Position: refs/heads/master@{#8336} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8336 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_audio/fir_filter.cc | 2 +- webrtc/common_audio/resampler/sinc_resampler.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/common_audio/fir_filter.cc b/webrtc/common_audio/fir_filter.cc index a5160fdc8f..3be9148737 100644 --- a/webrtc/common_audio/fir_filter.cc +++ b/webrtc/common_audio/fir_filter.cc @@ -57,7 +57,7 @@ FIRFilter* FIRFilter::Create(const float* coefficients, filter = new FIRFilterC(coefficients, coefficients_length); } #endif -#elif defined(WEBRTC_ARCH_ARM_V7) +#elif defined(WEBRTC_DETECT_ARM_NEON) || defined(WEBRTC_ARCH_ARM_NEON) #if defined(WEBRTC_ARCH_ARM_NEON) filter = new FIRFilterNEON(coefficients, coefficients_length, max_input_length); diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc index 1f987a416f..0e18ac55e2 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.cc +++ b/webrtc/common_audio/resampler/sinc_resampler.cc @@ -128,7 +128,7 @@ void SincResampler::InitializeCPUSpecificFeatures() { convolve_proc_ = WebRtc_GetCPUInfo(kSSE2) ? Convolve_SSE : Convolve_C; } #endif -#elif defined(WEBRTC_ARCH_ARM_V7) +#elif defined(WEBRTC_DETECT_ARM_NEON) || defined(WEBRTC_ARCH_ARM_NEON) #if defined(WEBRTC_ARCH_ARM_NEON) #define CONVOLVE_FUNC Convolve_NEON void SincResampler::InitializeCPUSpecificFeatures() {}