Updating Opus to release 1.1

celt/arm/arm_celt_map.c

Index: celt/arm/arm_celt_map.c
diff --git a/celt/cpu_support.h b/celt/arm/arm_celt_map.c
similarity index 70%
copy from celt/cpu_support.h
copy to celt/arm/arm_celt_map.c
index 41481feb9c69041d7f2df636376dd9590ed53a2d..547a84d14959adb1480af4a76665ae42892b700e 100644
--- a/celt/cpu_support.h
+++ b/celt/arm/arm_celt_map.c
@@ -25,27 +25,25 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef CPU_SUPPORT_H
-#define CPU_SUPPORT_H
-
-#if defined(OPUS_HAVE_RTCD) && defined(ARMv4_ASM)
-#include "arm/armcpu.h"
-
-/* We currently support 4 ARM variants:
- * arch[0] -> ARMv4
- * arch[1] -> ARMv5E
- * arch[2] -> ARMv6
- * arch[3] -> NEON
- */
-#define OPUS_ARCHMASK 3
-
-#else
-#define OPUS_ARCHMASK 0
-
-static inline int opus_select_arch(void)
-{
-  return 0;
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
+#include "pitch.h"
+
+#if defined(OPUS_HAVE_RTCD)
+
+# if defined(FIXED_POINT)
+opus_val32 (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
+    const opus_val16 *, opus_val32 *, int , int) = {
+  celt_pitch_xcorr_c,               /* ARMv4 */
+  MAY_HAVE_EDSP(celt_pitch_xcorr),  /* EDSP */
+  MAY_HAVE_MEDIA(celt_pitch_xcorr), /* Media */
+  MAY_HAVE_NEON(celt_pitch_xcorr)   /* NEON */
+};
+# else
+#  error "Floating-point implementation is not supported by ARM asm yet." \
+ "Reconfigure with --disable-rtcd or send patches."
+# endif
+
 #endif