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/entcode.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/entcode.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/entcode.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/entcode.h b/lib/rbcodec/codecs/libopus/celt/entcode.h index aebecc0647..dd13e49e50 100644 --- a/lib/rbcodec/codecs/libopus/celt/entcode.h +++ b/lib/rbcodec/codecs/libopus/celt/entcode.h | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "opus_types.h" | 28 | #include "opus_types.h" |
29 | #include "opus_defines.h" | ||
29 | 30 | ||
30 | #if !defined(_entcode_H) | 31 | #if !defined(_entcode_H) |
31 | # define _entcode_H (1) | 32 | # define _entcode_H (1) |
@@ -83,15 +84,15 @@ struct ec_ctx{ | |||
83 | int error; | 84 | int error; |
84 | }; | 85 | }; |
85 | 86 | ||
86 | static inline opus_uint32 ec_range_bytes(ec_ctx *_this){ | 87 | static OPUS_INLINE opus_uint32 ec_range_bytes(ec_ctx *_this){ |
87 | return _this->offs; | 88 | return _this->offs; |
88 | } | 89 | } |
89 | 90 | ||
90 | static inline unsigned char *ec_get_buffer(ec_ctx *_this){ | 91 | static OPUS_INLINE unsigned char *ec_get_buffer(ec_ctx *_this){ |
91 | return _this->buf; | 92 | return _this->buf; |
92 | } | 93 | } |
93 | 94 | ||
94 | static inline int ec_get_error(ec_ctx *_this){ | 95 | static OPUS_INLINE int ec_get_error(ec_ctx *_this){ |
95 | return _this->error; | 96 | return _this->error; |
96 | } | 97 | } |
97 | 98 | ||
@@ -101,7 +102,7 @@ static inline int ec_get_error(ec_ctx *_this){ | |||
101 | Return: The number of bits. | 102 | Return: The number of bits. |
102 | This will always be slightly larger than the exact value (e.g., all | 103 | This will always be slightly larger than the exact value (e.g., all |
103 | rounding error is in the positive direction).*/ | 104 | rounding error is in the positive direction).*/ |
104 | static inline int ec_tell(ec_ctx *_this){ | 105 | static OPUS_INLINE int ec_tell(ec_ctx *_this){ |
105 | return _this->nbits_total-EC_ILOG(_this->rng); | 106 | return _this->nbits_total-EC_ILOG(_this->rng); |
106 | } | 107 | } |
107 | 108 | ||