aboutsummaryrefslogtreecommitdiff
path: root/celt/arm
diff options
context:
space:
mode:
authorJonathan Lennox <jonathan@vidyo.com>2015-11-20 23:02:53 -0500
committerTimothy B. Terriberry <tterribe@xiph.org>2016-07-06 15:00:01 -0700
commite6ac9fa993ff24dbf05fe003319b33f240bd8800 (patch)
tree35bdd3fd2864252fa838755e5e6514b440bdf6f0 /celt/arm
parent58dbcf23f3aecfb9c06abaef590d01bb3dba7a5a (diff)
downloadlibopus-e6ac9fa993ff24dbf05fe003319b33f240bd8800.tar.gz
Move ARM-specific macro overrides to arm-specific file.
Signed-off-by: Timothy B. Terriberry <tterribe@xiph.org>
Diffstat (limited to 'celt/arm')
-rw-r--r--celt/arm/pitch_arm.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/celt/arm/pitch_arm.h b/celt/arm/pitch_arm.h
index 8626ed75..eaf61c91 100644
--- a/celt/arm/pitch_arm.h
+++ b/celt/arm/pitch_arm.h
@@ -65,4 +65,24 @@ void celt_pitch_xcorr_float_neon(const opus_val16 *_x, const opus_val16 *_y,
#endif
#endif /* end !FIXED_POINT */
+
+/*Is run-time CPU detection enabled on this platform?*/
+# if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_ASM) \
+ || (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) \
+ && !defined(OPUS_ARM_PRESUME_NEON_INTR)))
+extern
+# if defined(FIXED_POINT)
+opus_val32
+# else
+void
+# endif
+(*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
+ const opus_val16 *, opus_val32 *, int, int);
+
+# define OVERRIDE_PITCH_XCORR
+# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+ ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \
+ xcorr, len, max_pitch))
+# endif
+
#endif