From 11f72b1945871b79f871c570a8df965a89d7f536 Mon Sep 17 00:00:00 2001 From: "Gordana.Cmiljanovic" Date: Thu, 27 Oct 2016 23:44:09 -0700 Subject: [PATCH] Fix compile error for non Intel platforms Fixing compile error for non Intel platforms when using C implemented fft functions (for example, optimizations are not implemented for mips64el and C functions must be used) Adding bypass of presubmit to avoid code style and header errors caused by the fact that files with legacy code are being renamed. NOPRESUBMIT=true BUG=webrtc:6595 TEST=gn gen out-gn/mips64-android-webrtc --args="is_debug=false target_os=\"android\" target_cpu=\"mips64el\"" ninja -C out-gn/mips64-android-webrtc audio_processing Review-Url: https://codereview.webrtc.org/2442773002 Cr-Commit-Position: refs/heads/master@{#14808} --- .../audio_processing/utility/ooura_fft.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/audio_processing/utility/ooura_fft.cc b/webrtc/modules/audio_processing/utility/ooura_fft.cc index 4ba88d7f17..30f203480d 100644 --- a/webrtc/modules/audio_processing/utility/ooura_fft.cc +++ b/webrtc/modules/audio_processing/utility/ooura_fft.cc @@ -348,12 +348,14 @@ void OouraFft::cft1st_128(float* a) const { cft1st_128_mips(a); #elif defined(WEBRTC_HAS_NEON) cft1st_128_neon(a); -#else +#elif defined(WEBRTC_ARCH_X86_FAMILY) if (use_sse2_) { cft1st_128_SSE2(a); } else { cft1st_128_C(a); } +#else + cft1st_128_C(a); #endif } void OouraFft::cftmdl_128(float* a) const { @@ -361,12 +363,14 @@ void OouraFft::cftmdl_128(float* a) const { cftmdl_128_mips(a); #elif defined(WEBRTC_HAS_NEON) cftmdl_128_neon(a); -#else +#elif defined(WEBRTC_ARCH_X86_FAMILY) if (use_sse2_) { cftmdl_128_SSE2(a); } else { cftmdl_128_C(a); } +#else + cftmdl_128_C(a); #endif } void OouraFft::rftfsub_128(float* a) const { @@ -374,12 +378,14 @@ void OouraFft::rftfsub_128(float* a) const { rftfsub_128_mips(a); #elif defined(WEBRTC_HAS_NEON) rftfsub_128_neon(a); -#else +#elif defined(WEBRTC_ARCH_X86_FAMILY) if (use_sse2_) { rftfsub_128_SSE2(a); } else { rftfsub_128_C(a); } +#else + rftfsub_128_C(a); #endif } @@ -388,12 +394,14 @@ void OouraFft::rftbsub_128(float* a) const { rftbsub_128_mips(a); #elif defined(WEBRTC_HAS_NEON) rftbsub_128_neon(a); -#else +#elif defined(WEBRTC_ARCH_X86_FAMILY) if (use_sse2_) { rftbsub_128_SSE2(a); } else { rftbsub_128_C(a); } +#else + rftbsub_128_C(a); #endif }