Updating Opus to release 1.1

celt/arm/pitch_arm.h

Index: celt/arm/pitch_arm.h
diff --git a/celt/cpu_support.h b/celt/arm/pitch_arm.h
similarity index 63%
copy from celt/cpu_support.h
copy to celt/arm/pitch_arm.h
index 41481feb9c69041d7f2df636376dd9590ed53a2d..a07f8ac2fa88c5c5d109284cc32b084c8a770994 100644
--- a/celt/cpu_support.h
+++ b/celt/arm/pitch_arm.h
@@ -25,27 +25,33 @@
    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;
-}
-#endif
+#if !defined(PITCH_ARM_H)
+# define PITCH_ARM_H
+
+# include "armcpu.h"
+
+# if defined(FIXED_POINT)
+
+#  if defined(OPUS_ARM_MAY_HAVE_NEON)
+opus_val32 celt_pitch_xcorr_neon(const opus_val16 *_x, const opus_val16 *_y,
+    opus_val32 *xcorr, int len, int max_pitch);
+#  endif
+
+#  if defined(OPUS_ARM_MAY_HAVE_MEDIA)
+#   define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
+#  endif
+
+#  if defined(OPUS_ARM_MAY_HAVE_EDSP)
+opus_val32 celt_pitch_xcorr_edsp(const opus_val16 *_x, const opus_val16 *_y,
+    opus_val32 *xcorr, int len, int max_pitch);
+#  endif
+
+#  if !defined(OPUS_HAVE_RTCD)
+#   define OVERRIDE_PITCH_XCORR (1)
+#   define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+  ((void)(arch),PRESUME_NEON(celt_pitch_xcorr)(_x, _y, xcorr, len, max_pitch))
+#  endif
+
+# endif
 
 #endif