summaryrefslogtreecommitdiffstats
path: root/lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2013-05-20 22:25:57 +0200
committerNils Wallménius <nils@rockbox.org>2013-08-31 08:30:51 +0200
commit580b307fd791c0997a8831bc800bba87797bfb7e (patch)
tree807846056f06fd944a750ce41217a877910ebd59 /lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h
parent74761b70acd96cecc0d35450dd56a98ad9ee7d3d (diff)
downloadrockbox-580b307fd791c0997a8831bc800bba87797bfb7e.tar.gz
rockbox-580b307fd791c0997a8831bc800bba87797bfb7e.zip
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
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h')
-rw-r--r--lib/rbcodec/codecs/libopus/celt/cf/fixed_cf.h56
1 files changed, 56 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