Index: webrtc/modules/audio_processing/aecm/aecm_core.cc |
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.cc b/webrtc/modules/audio_processing/aecm/aecm_core.cc |
index efaa7f0a8f36cff7f72c584edc6cf36346d1c4f9..a17220dbd76b11a678a1dfa4a811f5ec12561029 100644 |
--- a/webrtc/modules/audio_processing/aecm/aecm_core.cc |
+++ b/webrtc/modules/audio_processing/aecm/aecm_core.cc |
@@ -365,7 +365,7 @@ static void ResetAdaptiveChannelC(AecmCore* aecm) { |
} |
// Initialize function pointers for ARM Neon platform. |
-#if (defined WEBRTC_DETECT_NEON || defined WEBRTC_HAS_NEON) |
+#if defined(WEBRTC_HAS_NEON) |
static void WebRtcAecm_InitNeon(void) |
{ |
WebRtcAecm_StoreAdaptiveChannel = WebRtcAecm_StoreAdaptiveChannelNeon; |
@@ -512,13 +512,7 @@ int WebRtcAecm_InitCore(AecmCore* const aecm, int samplingFreq) { |
WebRtcAecm_StoreAdaptiveChannel = StoreAdaptiveChannelC; |
WebRtcAecm_ResetAdaptiveChannel = ResetAdaptiveChannelC; |
-#ifdef WEBRTC_DETECT_NEON |
- uint64_t features = WebRtc_GetCPUFeaturesARM(); |
- if ((features & kCPUFeatureNEON) != 0) |
- { |
- WebRtcAecm_InitNeon(); |
- } |
-#elif defined(WEBRTC_HAS_NEON) |
+#if defined(WEBRTC_HAS_NEON) |
WebRtcAecm_InitNeon(); |
#endif |