| Index: webrtc/common_audio/signal_processing/include/signal_processing_library.h
|
| diff --git a/webrtc/common_audio/signal_processing/include/signal_processing_library.h b/webrtc/common_audio/signal_processing/include/signal_processing_library.h
|
| index 2e96883e6de96a1620d85a4f3118d4004b7bfc4f..19379bf084f7143f7c2bb47b44c7965433f1f87b 100644
|
| --- a/webrtc/common_audio/signal_processing/include/signal_processing_library.h
|
| +++ b/webrtc/common_audio/signal_processing/include/signal_processing_library.h
|
| @@ -106,10 +106,8 @@ extern "C" {
|
|
|
| // Initialize SPL. Currently it contains only function pointer initialization.
|
| // If the underlying platform is known to be ARM-Neon (WEBRTC_HAS_NEON defined),
|
| -// the pointers will be assigned to code optimized for Neon; otherwise
|
| -// if run-time Neon detection (WEBRTC_DETECT_NEON) is enabled, the pointers
|
| -// will be assigned to either Neon code or generic C code; otherwise, generic C
|
| -// code will be assigned.
|
| +// the pointers will be assigned to code optimized for Neon; otherwise, generic
|
| +// C code will be assigned.
|
| // Note that this function MUST be called in any application that uses SPL
|
| // functions.
|
| void WebRtcSpl_Init();
|
| @@ -153,7 +151,7 @@ void WebRtcSpl_ZerosArrayW32(int32_t* vector,
|
| typedef int16_t (*MaxAbsValueW16)(const int16_t* vector, size_t length);
|
| extern MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16;
|
| int16_t WebRtcSpl_MaxAbsValueW16C(const int16_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int16_t WebRtcSpl_MaxAbsValueW16Neon(const int16_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS32_LE)
|
| @@ -170,7 +168,7 @@ int16_t WebRtcSpl_MaxAbsValueW16_mips(const int16_t* vector, size_t length);
|
| typedef int32_t (*MaxAbsValueW32)(const int32_t* vector, size_t length);
|
| extern MaxAbsValueW32 WebRtcSpl_MaxAbsValueW32;
|
| int32_t WebRtcSpl_MaxAbsValueW32C(const int32_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int32_t WebRtcSpl_MaxAbsValueW32Neon(const int32_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS_DSP_R1_LE)
|
| @@ -187,7 +185,7 @@ int32_t WebRtcSpl_MaxAbsValueW32_mips(const int32_t* vector, size_t length);
|
| typedef int16_t (*MaxValueW16)(const int16_t* vector, size_t length);
|
| extern MaxValueW16 WebRtcSpl_MaxValueW16;
|
| int16_t WebRtcSpl_MaxValueW16C(const int16_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int16_t WebRtcSpl_MaxValueW16Neon(const int16_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS32_LE)
|
| @@ -204,7 +202,7 @@ int16_t WebRtcSpl_MaxValueW16_mips(const int16_t* vector, size_t length);
|
| typedef int32_t (*MaxValueW32)(const int32_t* vector, size_t length);
|
| extern MaxValueW32 WebRtcSpl_MaxValueW32;
|
| int32_t WebRtcSpl_MaxValueW32C(const int32_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int32_t WebRtcSpl_MaxValueW32Neon(const int32_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS32_LE)
|
| @@ -221,7 +219,7 @@ int32_t WebRtcSpl_MaxValueW32_mips(const int32_t* vector, size_t length);
|
| typedef int16_t (*MinValueW16)(const int16_t* vector, size_t length);
|
| extern MinValueW16 WebRtcSpl_MinValueW16;
|
| int16_t WebRtcSpl_MinValueW16C(const int16_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int16_t WebRtcSpl_MinValueW16Neon(const int16_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS32_LE)
|
| @@ -238,7 +236,7 @@ int16_t WebRtcSpl_MinValueW16_mips(const int16_t* vector, size_t length);
|
| typedef int32_t (*MinValueW32)(const int32_t* vector, size_t length);
|
| extern MinValueW32 WebRtcSpl_MinValueW32;
|
| int32_t WebRtcSpl_MinValueW32C(const int32_t* vector, size_t length);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int32_t WebRtcSpl_MinValueW32Neon(const int32_t* vector, size_t length);
|
| #endif
|
| #if defined(MIPS32_LE)
|
| @@ -531,7 +529,7 @@ void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
|
| size_t dim_cross_correlation,
|
| int right_shifts,
|
| int step_seq2);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
|
| const int16_t* seq1,
|
| const int16_t* seq2,
|
| @@ -698,7 +696,7 @@ int WebRtcSpl_DownsampleFastC(const int16_t* data_in,
|
| size_t coefficients_length,
|
| int factor,
|
| size_t delay);
|
| -#if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
|
| +#if defined(WEBRTC_HAS_NEON)
|
| int WebRtcSpl_DownsampleFastNeon(const int16_t* data_in,
|
| size_t data_in_length,
|
| int16_t* data_out,
|
|
|