Sync opus codec to upstream git

Sync opus codec to upstream commit
02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013)

This brings in a lot of optimizations but also makes the diff
between our codec and the upstream much smaller as most of our
optimizations have been upstreamed or supeceded.

Speedups across the board for CELT mode files:

        64kbps      128kbps
H300    9.82MHz     15.48MHz
c200	4.86MHz     9.63MHz
fuze v1 10.32MHz    15.92MHz

For the silk mode test file (16kbps) arm targets get a speedup
of about 2MHz while the H300 is 7.8MHz slower, likely because it's
now using the pseudostack more rather than the real stack which
is in iram. Patches to get around that are upcomming.

Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3

2 files changed, 113 insertions, 0 deletions

diff --git a/lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h b/lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h
new file mode 100644
index 0000000000..c442a55663
--- /dev/null
+++ b/lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h
@@ -0,0 +1,56 @@
+/* Copyright (C) 2013 Nils Wallménius */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef FIXED_CF_H
+#define FIXED_CF_H
+
+#undef MULT16_32_Q15
+static inline int32_t MULT16_32_Q15_cf(int32_t a, int32_t b)
+{
+  int32_t r;
+  asm volatile ("mac.l %[a], %[b], %%acc0;"
+                "movclr.l %%acc0, %[r];"
+                : [r] "=r" (r)
+                : [a] "r" (a<<16), [b] "r" (b)
+                : "cc");
+  return r;
+}
+#define MULT16_32_Q15(a, b) (MULT16_32_Q15_cf(a, b))
+
+#undef MULT32_32_Q31
+static inline int32_t MULT32_32_Q31_cf(int32_t a, int32_t b)
+{
+  int32_t r;
+  asm volatile ("mac.l %[a], %[b], %%acc0;"
+                "movclr.l %%acc0, %[r];"
+                : [r] "=r" (r)
+                : [a] "r" (a), [b] "r" (b)
+                : "cc");
+  return r;
+}
+#define MULT32_32_Q31(a, b) (MULT32_32_Q31_cf(a, b))
+
+#endif
diff --git a/lib/rbcodec/codecs/libopus/celt/cf/kiss_fft_cf.h b/lib/rbcodec/codecs/libopus/celt/cf/kiss_fft_cf.h
new file mode 100644
index 0000000000..fe0fe2f3ca
--- /dev/null
+++ b/lib/rbcodec/codecs/libopus/celt/cf/kiss_fft_cf.h
@@ -0,0 +1,57 @@
+/*Copyright (c) 2013, Xiph.Org Foundation and contributors.
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.*/
+
+#ifndef KISS_FFT_CF_H
+#define KISS_FFT_CF_H
+
+#if !defined(KISS_FFT_GUTS_H)
+#error "This file should only be included from _kiss_fft_guts.h"
+#endif
+
+#ifdef FIXED_POINT
+
+#undef C_MULC
+#define C_MULC(m,a,b) \
+    { \
+      asm volatile("move.l (%[bp]), %%d2;" \
+                   "clr.l %%d3;" \
+                   "move.w %%d2, %%d3;" \
+                   "swap %%d3;" \
+                   "clr.w %%d2;" \
+                   "movem.l (%[ap]), %%d0-%%d1;" \
+                   "mac.l %%d0, %%d2, %%acc0;" \
+                   "mac.l %%d1, %%d3, %%acc0;" \
+                   "mac.l %%d1, %%d2, %%acc1;" \
+                   "msac.l %%d0, %%d3, %%acc1;" \
+                   "movclr.l %%acc0, %[mr];" \
+                   "movclr.l %%acc1, %[mi];" \
+                   : [mr] "=r" ((m).r), [mi] "=r" ((m).i) \
+                   : [ap] "a" (&(a)), [bp] "a" (&(b)) \
+                   : "d0", "d1", "d2", "d3", "cc"); \
+    }
+
+#endif /* FIXED_POINT */
+
+#endif /* KISS_FFT_CF_H */