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/shell_coder.c | |
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/shell_coder.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/shell_coder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/shell_coder.c b/lib/rbcodec/codecs/libopus/silk/shell_coder.c index f402cc4328..9d6e1bb366 100644 --- a/lib/rbcodec/codecs/libopus/silk/shell_coder.c +++ b/lib/rbcodec/codecs/libopus/silk/shell_coder.c | |||
@@ -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. |
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
33 | 33 | ||
34 | /* shell coder; pulse-subframe length is hardcoded */ | 34 | /* shell coder; pulse-subframe length is hardcoded */ |
35 | 35 | ||
36 | static inline void combine_pulses( | 36 | static OPUS_INLINE void combine_pulses( |
37 | opus_int *out, /* O combined pulses vector [len] */ | 37 | opus_int *out, /* O combined pulses vector [len] */ |
38 | const opus_int *in, /* I input vector [2 * len] */ | 38 | const opus_int *in, /* I input vector [2 * len] */ |
39 | const opus_int len /* I number of OUTPUT samples */ | 39 | const opus_int len /* I number of OUTPUT samples */ |
@@ -46,7 +46,7 @@ static inline void combine_pulses( | |||
46 | } | 46 | } |
47 | 47 | ||
48 | #if 0 | 48 | #if 0 |
49 | static inline void encode_split( | 49 | static OPUS_INLINE void encode_split( |
50 | ec_enc *psRangeEnc, /* I/O compressor data structure */ | 50 | ec_enc *psRangeEnc, /* I/O compressor data structure */ |
51 | const opus_int p_child1, /* I pulse amplitude of first child subframe */ | 51 | const opus_int p_child1, /* I pulse amplitude of first child subframe */ |
52 | const opus_int p, /* I pulse amplitude of current subframe */ | 52 | const opus_int p, /* I pulse amplitude of current subframe */ |
@@ -59,7 +59,7 @@ static inline void encode_split( | |||
59 | } | 59 | } |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | static inline void decode_split( | 62 | static OPUS_INLINE void decode_split( |
63 | opus_int *p_child1, /* O pulse amplitude of first child subframe */ | 63 | opus_int *p_child1, /* O pulse amplitude of first child subframe */ |
64 | opus_int *p_child2, /* O pulse amplitude of second child subframe */ | 64 | opus_int *p_child2, /* O pulse amplitude of second child subframe */ |
65 | ec_dec *psRangeDec, /* I/O Compressor data structure */ | 65 | ec_dec *psRangeDec, /* I/O Compressor data structure */ |