Index: webrtc/common_audio/signal_processing/spl_init.c |
diff --git a/webrtc/common_audio/signal_processing/spl_init.c b/webrtc/common_audio/signal_processing/spl_init.c |
index fdab0383997c1ab863d2984c9abcc7a204690857..c9c4e659cf3baad8a9ca0ce5d0409d9809bfae7f 100644 |
--- a/webrtc/common_audio/signal_processing/spl_init.c |
+++ b/webrtc/common_audio/signal_processing/spl_init.c |
@@ -28,8 +28,7 @@ CrossCorrelation WebRtcSpl_CrossCorrelation; |
DownsampleFast WebRtcSpl_DownsampleFast; |
ScaleAndAddVectorsWithRound WebRtcSpl_ScaleAndAddVectorsWithRound; |
-#if (defined(WEBRTC_DETECT_NEON) || !defined(WEBRTC_HAS_NEON)) && \ |
- !defined(MIPS32_LE) |
+#if (!defined(WEBRTC_HAS_NEON)) && !defined(MIPS32_LE) |
/* Initialize function pointers to the generic C version. */ |
static void InitPointersToC() { |
WebRtcSpl_MaxAbsValueW16 = WebRtcSpl_MaxAbsValueW16C; |
@@ -45,7 +44,7 @@ static void InitPointersToC() { |
} |
#endif |
-#if defined(WEBRTC_DETECT_NEON) || defined(WEBRTC_HAS_NEON) |
+#if defined(WEBRTC_HAS_NEON) |
/* Initialize function pointers to the Neon version. */ |
static void InitPointersToNeon() { |
WebRtcSpl_MaxAbsValueW16 = WebRtcSpl_MaxAbsValueW16Neon; |
@@ -84,19 +83,13 @@ static void InitPointersToMIPS() { |
#endif |
static void InitFunctionPointers(void) { |
-#if defined(WEBRTC_DETECT_NEON) |
- if ((WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) != 0) { |
- InitPointersToNeon(); |
- } else { |
- InitPointersToC(); |
- } |
-#elif defined(WEBRTC_HAS_NEON) |
+#if defined(WEBRTC_HAS_NEON) |
InitPointersToNeon(); |
#elif defined(MIPS32_LE) |
InitPointersToMIPS(); |
#else |
InitPointersToC(); |
-#endif /* WEBRTC_DETECT_NEON */ |
+#endif /* WEBRTC_HAS_NEON */ |
} |
#if defined(WEBRTC_POSIX) |