diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-12-11 22:59:14 +0100 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-12-16 21:13:23 +0100 |
commit | e3c2ed7a71f65dc721c7210f120259ecd4ff65cb (patch) | |
tree | de593c1e927dcc036f1b6656f1f881995491b3b9 /lib/rbcodec/codecs/libopus/celt/arch.h | |
parent | d0918b98fa0cfba21208a4fb5ed153687b8f02c3 (diff) | |
download | rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.tar.gz rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.zip |
Sync libopus to upstream release 1.1
Change-Id: I9fea7460fc33f60faff961b3389dd97b5191463c
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/arch.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/arch.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/arch.h b/lib/rbcodec/codecs/libopus/celt/arch.h index c0f9413d00..b2d26c4ee4 100644 --- a/lib/rbcodec/codecs/libopus/celt/arch.h +++ b/lib/rbcodec/codecs/libopus/celt/arch.h | |||
@@ -35,6 +35,7 @@ | |||
35 | #define ARCH_H | 35 | #define ARCH_H |
36 | 36 | ||
37 | #include "opus_types.h" | 37 | #include "opus_types.h" |
38 | #include "opus_defines.h" | ||
38 | 39 | ||
39 | # if !defined(__GNUC_PREREQ) | 40 | # if !defined(__GNUC_PREREQ) |
40 | # if defined(__GNUC__)&&defined(__GNUC_MINOR__) | 41 | # if defined(__GNUC__)&&defined(__GNUC_MINOR__) |
@@ -54,7 +55,7 @@ | |||
54 | #ifdef __GNUC__ | 55 | #ifdef __GNUC__ |
55 | __attribute__((noreturn)) | 56 | __attribute__((noreturn)) |
56 | #endif | 57 | #endif |
57 | static inline void _celt_fatal(const char *str, const char *file, int line) | 58 | static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line) |
58 | { | 59 | { |
59 | fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); | 60 | fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); |
60 | abort(); | 61 | abort(); |
@@ -113,9 +114,9 @@ typedef opus_val32 celt_ener; | |||
113 | 114 | ||
114 | #include "fixed_generic.h" | 115 | #include "fixed_generic.h" |
115 | 116 | ||
116 | #ifdef ARMv5E_ASM | 117 | #ifdef OPUS_ARM_INLINE_EDSP |
117 | #include "arm/fixed_armv5e.h" | 118 | #include "arm/fixed_armv5e.h" |
118 | #elif defined (ARMv4_ASM) | 119 | #elif defined (OPUS_ARM_INLINE_ASM) |
119 | #include "arm/fixed_armv4.h" | 120 | #include "arm/fixed_armv4.h" |
120 | #elif defined (BFIN_ASM) | 121 | #elif defined (BFIN_ASM) |
121 | #include "fixed_bfin.h" | 122 | #include "fixed_bfin.h" |
@@ -123,7 +124,7 @@ typedef opus_val32 celt_ener; | |||
123 | #include "fixed_c5x.h" | 124 | #include "fixed_c5x.h" |
124 | #elif defined (TI_C6X_ASM) | 125 | #elif defined (TI_C6X_ASM) |
125 | #include "fixed_c6x.h" | 126 | #include "fixed_c6x.h" |
126 | #elif defined (CF_ASM) | 127 | #elif defined (OPUS_CF_INLINE_ASM) |
127 | #include "cf/fixed_cf.h" | 128 | #include "cf/fixed_cf.h" |
128 | #endif | 129 | #endif |
129 | 130 | ||
@@ -187,6 +188,7 @@ typedef float celt_ener; | |||
187 | #define MAC16_32_Q15(c,a,b) ((c)+(a)*(b)) | 188 | #define MAC16_32_Q15(c,a,b) ((c)+(a)*(b)) |
188 | 189 | ||
189 | #define MULT16_16_Q11_32(a,b) ((a)*(b)) | 190 | #define MULT16_16_Q11_32(a,b) ((a)*(b)) |
191 | #define MULT16_16_Q11(a,b) ((a)*(b)) | ||
190 | #define MULT16_16_Q13(a,b) ((a)*(b)) | 192 | #define MULT16_16_Q13(a,b) ((a)*(b)) |
191 | #define MULT16_16_Q14(a,b) ((a)*(b)) | 193 | #define MULT16_16_Q14(a,b) ((a)*(b)) |
192 | #define MULT16_16_Q15(a,b) ((a)*(b)) | 194 | #define MULT16_16_Q15(a,b) ((a)*(b)) |