James Zern
2017-Feb-04 02:55 UTC
[opus] [PATCH] fix ARM build w/--disable-intrinsics --enable-asm
and rtcd disabled (CFLAGS=-mfpu=neon)
broken since:
cfdaf365 Optimize silk_NSQ_del_dec() for ARM NEON
---
silk/arm/NSQ_del_dec_arm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/silk/arm/NSQ_del_dec_arm.h b/silk/arm/NSQ_del_dec_arm.h
index c62b5055..9e76e169 100644
--- a/silk/arm/NSQ_del_dec_arm.h
+++ b/silk/arm/NSQ_del_dec_arm.h
@@ -43,7 +43,6 @@ void silk_NSQ_del_dec_neon(
const opus_int32 Gains_Q16[MAX_NB_SUBFR],
const opus_int pitchL[MAX_NB_SUBFR], const opus_int Lambda_Q10,
const opus_int LTP_scale_Q14);
-#endif
#if !defined(OPUS_HAVE_RTCD)
#define OVERRIDE_silk_NSQ_del_dec (1)
@@ -57,6 +56,7 @@ void silk_NSQ_del_dec_neon(
AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
Lambda_Q10, LTP_scale_Q14))
#endif
+#endif
#if !defined(OVERRIDE_silk_NSQ_del_dec)
/*Is run-time CPU detection enabled on this platform?*/
--
2.11.0.483.g087da7b7c-goog
Jean-Marc Valin
2017-Feb-04 14:57 UTC
[opus] [PATCH] fix ARM build w/--disable-intrinsics --enable-asm
Thanks for the patch. Just merged it. Jean-Marc On 03/02/17 09:55 PM, James Zern wrote:> and rtcd disabled (CFLAGS=-mfpu=neon) > > broken since: > cfdaf365 Optimize silk_NSQ_del_dec() for ARM NEON > --- > silk/arm/NSQ_del_dec_arm.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/silk/arm/NSQ_del_dec_arm.h b/silk/arm/NSQ_del_dec_arm.h > index c62b5055..9e76e169 100644 > --- a/silk/arm/NSQ_del_dec_arm.h > +++ b/silk/arm/NSQ_del_dec_arm.h > @@ -43,7 +43,6 @@ void silk_NSQ_del_dec_neon( > const opus_int32 Gains_Q16[MAX_NB_SUBFR], > const opus_int pitchL[MAX_NB_SUBFR], const opus_int Lambda_Q10, > const opus_int LTP_scale_Q14); > -#endif > > #if !defined(OPUS_HAVE_RTCD) > #define OVERRIDE_silk_NSQ_del_dec (1) > @@ -57,6 +56,7 @@ void silk_NSQ_del_dec_neon( > AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \ > Lambda_Q10, LTP_scale_Q14)) > #endif > +#endif > > #if !defined(OVERRIDE_silk_NSQ_del_dec) > /*Is run-time CPU detection enabled on this platform?*/ >