Remove runtime NEON detection

webrtc/common_audio/signal_processing/spl_init.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16;
 MaxAbsValueW32 WebRtcSpl_MaxAbsValueW32;
 MaxValueW16 WebRtcSpl_MaxValueW16;
 MaxValueW32 WebRtcSpl_MaxValueW32;
 MinValueW16 WebRtcSpl_MinValueW16;
 MinValueW32 WebRtcSpl_MinValueW32;
 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;
   WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32C;
   WebRtcSpl_MaxValueW16 = WebRtcSpl_MaxValueW16C;
   WebRtcSpl_MaxValueW32 = WebRtcSpl_MaxValueW32C;
   WebRtcSpl_MinValueW16 = WebRtcSpl_MinValueW16C;
   WebRtcSpl_MinValueW32 = WebRtcSpl_MinValueW32C;
   WebRtcSpl_CrossCorrelation = WebRtcSpl_CrossCorrelationC;
   WebRtcSpl_DownsampleFast = WebRtcSpl_DownsampleFastC;
   WebRtcSpl_ScaleAndAddVectorsWithRound =
       WebRtcSpl_ScaleAndAddVectorsWithRoundC;
 }
 #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;
   WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32Neon;
   WebRtcSpl_MaxValueW16 = WebRtcSpl_MaxValueW16Neon;
   WebRtcSpl_MaxValueW32 = WebRtcSpl_MaxValueW32Neon;
   WebRtcSpl_MinValueW16 = WebRtcSpl_MinValueW16Neon;
   WebRtcSpl_MinValueW32 = WebRtcSpl_MinValueW32Neon;
   WebRtcSpl_CrossCorrelation = WebRtcSpl_CrossCorrelationNeon;
   WebRtcSpl_DownsampleFast = WebRtcSpl_DownsampleFastNeon;
@@ skipping 18 matching lines @@
       WebRtcSpl_ScaleAndAddVectorsWithRound_mips;
 #else
   WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32C;
   WebRtcSpl_ScaleAndAddVectorsWithRound =
       WebRtcSpl_ScaleAndAddVectorsWithRoundC;
 #endif
 }
 #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)
 #include <pthread.h>
 
 static void once(void (*func)(void)) {
   static pthread_once_t lock = PTHREAD_ONCE_INIT;
   pthread_once(&lock, func);
 }
 
@@ skipping 21 matching lines @@
 
 /* There's no fallback version as an #else block here to ensure thread safety.
  * In case of neither pthread for WEBRTC_POSIX nor _WIN32 is present, build
  * system should pick it up.
  */
 #endif  /* WEBRTC_POSIX */
 
 void WebRtcSpl_Init() {
   once(InitFunctionPointers);
 }