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/Inlines.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/Inlines.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/Inlines.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/Inlines.h b/lib/rbcodec/codecs/libopus/silk/Inlines.h index bec35eb7dc..ec986cdfdd 100644 --- a/lib/rbcodec/codecs/libopus/silk/Inlines.h +++ b/lib/rbcodec/codecs/libopus/silk/Inlines.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. |
@@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
26 | ***********************************************************************/ | 26 | ***********************************************************************/ |
27 | 27 | ||
28 | /*! \file silk_Inlines.h | 28 | /*! \file silk_Inlines.h |
29 | * \brief silk_Inlines.h defines inline signal processing functions. | 29 | * \brief silk_Inlines.h defines OPUS_INLINE signal processing functions. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #ifndef SILK_FIX_INLINES_H | 32 | #ifndef SILK_FIX_INLINES_H |
@@ -38,7 +38,7 @@ extern "C" | |||
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | /* count leading zeros of opus_int64 */ | 40 | /* count leading zeros of opus_int64 */ |
41 | static inline opus_int32 silk_CLZ64( opus_int64 in ) | 41 | static OPUS_INLINE opus_int32 silk_CLZ64( opus_int64 in ) |
42 | { | 42 | { |
43 | opus_int32 in_upper; | 43 | opus_int32 in_upper; |
44 | 44 | ||
@@ -53,7 +53,7 @@ static inline opus_int32 silk_CLZ64( opus_int64 in ) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | /* get number of leading zeros and fractional part (the bits right after the leading one */ | 55 | /* get number of leading zeros and fractional part (the bits right after the leading one */ |
56 | static inline void silk_CLZ_FRAC( | 56 | static OPUS_INLINE void silk_CLZ_FRAC( |
57 | opus_int32 in, /* I input */ | 57 | opus_int32 in, /* I input */ |
58 | opus_int32 *lz, /* O number of leading zeros */ | 58 | opus_int32 *lz, /* O number of leading zeros */ |
59 | opus_int32 *frac_Q7 /* O the 7 bits right after the leading one */ | 59 | opus_int32 *frac_Q7 /* O the 7 bits right after the leading one */ |
@@ -68,7 +68,7 @@ static inline void silk_CLZ_FRAC( | |||
68 | /* Approximation of square root */ | 68 | /* Approximation of square root */ |
69 | /* Accuracy: < +/- 10% for output values > 15 */ | 69 | /* Accuracy: < +/- 10% for output values > 15 */ |
70 | /* < +/- 2.5% for output values > 120 */ | 70 | /* < +/- 2.5% for output values > 120 */ |
71 | static inline opus_int32 silk_SQRT_APPROX( opus_int32 x ) | 71 | static OPUS_INLINE opus_int32 silk_SQRT_APPROX( opus_int32 x ) |
72 | { | 72 | { |
73 | opus_int32 y, lz, frac_Q7; | 73 | opus_int32 y, lz, frac_Q7; |
74 | 74 | ||
@@ -94,7 +94,7 @@ static inline opus_int32 silk_SQRT_APPROX( opus_int32 x ) | |||
94 | } | 94 | } |
95 | 95 | ||
96 | /* Divide two int32 values and return result as int32 in a given Q-domain */ | 96 | /* Divide two int32 values and return result as int32 in a given Q-domain */ |
97 | static inline opus_int32 silk_DIV32_varQ( /* O returns a good approximation of "(a32 << Qres) / b32" */ | 97 | static OPUS_INLINE opus_int32 silk_DIV32_varQ( /* O returns a good approximation of "(a32 << Qres) / b32" */ |
98 | const opus_int32 a32, /* I numerator (Q0) */ | 98 | const opus_int32 a32, /* I numerator (Q0) */ |
99 | const opus_int32 b32, /* I denominator (Q0) */ | 99 | const opus_int32 b32, /* I denominator (Q0) */ |
100 | const opus_int Qres /* I Q-domain of result (>= 0) */ | 100 | const opus_int Qres /* I Q-domain of result (>= 0) */ |
@@ -140,7 +140,7 @@ static inline opus_int32 silk_DIV32_varQ( /* O returns a good approximation | |||
140 | } | 140 | } |
141 | 141 | ||
142 | /* Invert int32 value and return result as int32 in a given Q-domain */ | 142 | /* Invert int32 value and return result as int32 in a given Q-domain */ |
143 | static inline opus_int32 silk_INVERSE32_varQ( /* O returns a good approximation of "(1 << Qres) / b32" */ | 143 | static OPUS_INLINE opus_int32 silk_INVERSE32_varQ( /* O returns a good approximation of "(1 << Qres) / b32" */ |
144 | const opus_int32 b32, /* I denominator (Q0) */ | 144 | const opus_int32 b32, /* I denominator (Q0) */ |
145 | const opus_int Qres /* I Q-domain of result (> 0) */ | 145 | const opus_int Qres /* I Q-domain of result (> 0) */ |
146 | ) | 146 | ) |