summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/config.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/config.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/config.h')
-rw-r--r--lib/rbcodec/codecs/libopus/config.h55
1 files changed, 55 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/libopus/config.h b/lib/rbcodec/codecs/libopus/config.h
new file mode 100644
index 0000000000..e2d9b1e9aa
--- /dev/null
+++ b/lib/rbcodec/codecs/libopus/config.h
@@ -0,0 +1,55 @@
1#ifndef CONFIG_H
2#define CONFIG_H
3
4#include "rbcodecconfig.h"
5#include "codeclib.h"
6#include "ogg/ogg.h"
7
8/* general stuff */
9#define OPUS_BUILD
10
11/* alloc stuff */
12#define NONTHREADSAFE_PSEUDOSTACK
13
14#define OVERRIDE_OPUS_ALLOC
15#define OVERRIDE_OPUS_FREE
16#define OVERRIDE_OPUS_ALLOC_SCRATCH
17
18#define opus_alloc _ogg_malloc
19#define opus_free _ogg_free
20#define opus_alloc_scratch _ogg_malloc
21
22/* lrint */
23#define HAVE_LRINTF 0
24#define HAVE_LRINT 0
25
26/* embedded stuff */
27#define FIXED_POINT
28#define DISABLE_FLOAT_API
29#define EMBEDDED_ARM 1
30
31/* undefinitions */
32#ifdef ABS
33#undef ABS
34#endif
35#ifdef MIN
36#undef MIN
37#endif
38#ifdef MAX
39#undef MAX
40#endif
41
42#if defined(CPU_ARM)
43#if ARM_ARCH == 4
44#define ARMv4_ASM
45#elif ARM_ARCH > 4
46#define ARMv5E_ASM
47#endif
48#endif
49
50#if defined(CPU_COLDFIRE)
51#define CF_ASM
52#endif
53
54#endif /* CONFIG_H */
55