| Index: webrtc/modules/audio_processing/ns/nsx_core.c
|
| diff --git a/webrtc/modules/audio_processing/ns/nsx_core.c b/webrtc/modules/audio_processing/ns/nsx_core.c
|
| index 25f16d26abc7d5e76fa231b9d5ef5ac4a92a904d..94b6449776f61e49488f05b1a7303ad3d0cbb12e 100644
|
| --- a/webrtc/modules/audio_processing/ns/nsx_core.c
|
| +++ b/webrtc/modules/audio_processing/ns/nsx_core.c
|
| @@ -19,7 +19,7 @@
|
| #include "webrtc/modules/audio_processing/ns/nsx_core.h"
|
| #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
|
|
|
| -#if (defined WEBRTC_DETECT_NEON || defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| /* Tables are defined in ARM assembly files. */
|
| extern const int16_t WebRtcNsx_kLogTable[9];
|
| extern const int16_t WebRtcNsx_kCounterDiv[201];
|
| @@ -65,7 +65,7 @@ static const int16_t WebRtcNsx_kLogTableFrac[256] = {
|
| 237, 238, 238, 239, 240, 241, 241, 242, 243, 244, 244, 245, 246, 247, 247,
|
| 248, 249, 249, 250, 251, 252, 252, 253, 254, 255, 255
|
| };
|
| -#endif // WEBRTC_DETECT_NEON || WEBRTC_HAS_NEON
|
| +#endif // WEBRTC_HAS_NEON
|
|
|
| // Skip first frequency bins during estimation. (0 <= value < 64)
|
| static const size_t kStartBand = 5;
|
| @@ -557,7 +557,7 @@ AnalysisUpdate WebRtcNsx_AnalysisUpdate;
|
| Denormalize WebRtcNsx_Denormalize;
|
| NormalizeRealBuffer WebRtcNsx_NormalizeRealBuffer;
|
|
|
| -#if (defined WEBRTC_DETECT_NEON || defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| // Initialize function pointers for ARM Neon platform.
|
| static void WebRtcNsx_InitNeon(void) {
|
| WebRtcNsx_NoiseEstimation = WebRtcNsx_NoiseEstimationNeon;
|
| @@ -762,12 +762,7 @@ int32_t WebRtcNsx_InitCore(NoiseSuppressionFixedC* inst, uint32_t fs) {
|
| WebRtcNsx_Denormalize = DenormalizeC;
|
| WebRtcNsx_NormalizeRealBuffer = NormalizeRealBufferC;
|
|
|
| -#ifdef WEBRTC_DETECT_NEON
|
| - uint64_t features = WebRtc_GetCPUFeaturesARM();
|
| - if ((features & kCPUFeatureNEON) != 0) {
|
| - WebRtcNsx_InitNeon();
|
| - }
|
| -#elif defined(WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| WebRtcNsx_InitNeon();
|
| #endif
|
|
|
|
|