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/silk/macros.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/silk/macros.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/macros.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/macros.h b/lib/rbcodec/codecs/libopus/silk/macros.h index 97f03c886a..482dc3c6eb 100644 --- a/lib/rbcodec/codecs/libopus/silk/macros.h +++ b/lib/rbcodec/codecs/libopus/silk/macros.h | |||
@@ -8,7 +8,7 @@ this list of conditions and the following disclaimer. | |||
8 | - Redistributions in binary form must reproduce the above copyright | 8 | - Redistributions in binary form must reproduce the above copyright |
9 | notice, this list of conditions and the following disclaimer in the | 9 | notice, this list of conditions and the following disclaimer in the |
10 | documentation and/or other materials provided with the distribution. | 10 | documentation and/or other materials provided with the distribution. |
11 | - Neither the name of Internet Society, IETF or IETF Trust, nor the | 11 | - Neither the name of Internet Society, IETF or IETF Trust, nor the |
12 | names of specific contributors, may be used to endorse or promote | 12 | names of specific contributors, may be used to endorse or promote |
13 | products derived from this software without specific prior written | 13 | products derived from this software without specific prior written |
14 | permission. | 14 | permission. |
@@ -32,7 +32,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
32 | #include "config.h" | 32 | #include "config.h" |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* This is an inline header file for general platform. */ | 35 | #include "opus_types.h" |
36 | #include "opus_defines.h" | ||
37 | |||
38 | /* This is an OPUS_INLINE header file for general platform. */ | ||
36 | 39 | ||
37 | /* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ | 40 | /* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ |
38 | #define silk_SMULWB(a32, b32) ((((a32) >> 16) * (opus_int32)((opus_int16)(b32))) + ((((a32) & 0x0000FFFF) * (opus_int32)((opus_int16)(b32))) >> 16)) | 41 | #define silk_SMULWB(a32, b32) ((((a32) >> 16) * (opus_int32)((opus_int16)(b32))) + ((((a32) & 0x0000FFFF) * (opus_int32)((opus_int16)(b32))) >> 16)) |
@@ -78,12 +81,12 @@ POSSIBILITY OF SUCH DAMAGE. | |||
78 | 81 | ||
79 | #include "ecintrin.h" | 82 | #include "ecintrin.h" |
80 | 83 | ||
81 | static inline opus_int32 silk_CLZ16(opus_int16 in16) | 84 | static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) |
82 | { | 85 | { |
83 | return 32 - EC_ILOG(in16<<16|0x8000); | 86 | return 32 - EC_ILOG(in16<<16|0x8000); |
84 | } | 87 | } |
85 | 88 | ||
86 | static inline opus_int32 silk_CLZ32(opus_int32 in32) | 89 | static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) |
87 | { | 90 | { |
88 | return in32 ? 32 - EC_ILOG(in32) : 32; | 91 | return in32 ? 32 - EC_ILOG(in32) : 32; |
89 | } | 92 | } |
@@ -100,15 +103,15 @@ static inline opus_int32 silk_CLZ32(opus_int32 in32) | |||
100 | (*((Matrix_base_adr) + ((row)+(M)*(column)))) | 103 | (*((Matrix_base_adr) + ((row)+(M)*(column)))) |
101 | #endif | 104 | #endif |
102 | 105 | ||
103 | #ifdef ARMv4_ASM | 106 | #ifdef OPUS_ARM_INLINE_ASM |
104 | #include "arm/macros_armv4.h" | 107 | #include "arm/macros_armv4.h" |
105 | #endif | 108 | #endif |
106 | 109 | ||
107 | #ifdef ARMv5E_ASM | 110 | #ifdef OPUS_ARM_INLINE_EDSP |
108 | #include "arm/macros_armv5e.h" | 111 | #include "arm/macros_armv5e.h" |
109 | #endif | 112 | #endif |
110 | 113 | ||
111 | #ifdef CF_ASM | 114 | #ifdef OPUS_CF_INLINE_ASM |
112 | #include "cf/macros_cf.h" | 115 | #include "cf/macros_cf.h" |
113 | #endif | 116 | #endif |
114 | 117 | ||