Renamed celt_[u]int* to opus_[u]int*
This commit is contained in:
parent
3f0962cc1e
commit
d77d6a58fc
43 changed files with 459 additions and 459 deletions
|
@ -25,7 +25,7 @@
|
|||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "celt_types.h"
|
||||
#include "opus_types.h"
|
||||
|
||||
#if !defined(_entcode_H)
|
||||
# define _entcode_H (1)
|
||||
|
@ -37,7 +37,7 @@
|
|||
|
||||
/*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a
|
||||
larger type, you can speed up the decoder by using it here.*/
|
||||
typedef celt_uint32 ec_window;
|
||||
typedef opus_uint32 ec_window;
|
||||
typedef struct ec_ctx ec_ctx;
|
||||
typedef struct ec_ctx ec_enc;
|
||||
typedef struct ec_ctx ec_dec;
|
||||
|
@ -62,9 +62,9 @@ struct ec_ctx{
|
|||
/*Buffered input/output.*/
|
||||
unsigned char *buf;
|
||||
/*The size of the buffer.*/
|
||||
celt_uint32 storage;
|
||||
opus_uint32 storage;
|
||||
/*The offset at which the last byte containing raw bits was read/written.*/
|
||||
celt_uint32 end_offs;
|
||||
opus_uint32 end_offs;
|
||||
/*Bits that will be read from/written at the end.*/
|
||||
ec_window end_window;
|
||||
/*Number of valid bits in end_window.*/
|
||||
|
@ -73,16 +73,16 @@ struct ec_ctx{
|
|||
This does not include partial bits currently in the range coder.*/
|
||||
int nbits_total;
|
||||
/*The offset at which the next range coder byte will be read/written.*/
|
||||
celt_uint32 offs;
|
||||
opus_uint32 offs;
|
||||
/*The number of values in the current range.*/
|
||||
celt_uint32 rng;
|
||||
opus_uint32 rng;
|
||||
/*In the decoder: the difference between the top of the current range and
|
||||
the input value, minus one.
|
||||
In the encoder: the low end of the current range.*/
|
||||
celt_uint32 val;
|
||||
opus_uint32 val;
|
||||
/*In the decoder: the saved normalization factor from ec_decode().
|
||||
In the encoder: the number of oustanding carry propagating symbols.*/
|
||||
celt_uint32 ext;
|
||||
opus_uint32 ext;
|
||||
/*A buffered input/output symbol, awaiting carry propagation.*/
|
||||
int rem;
|
||||
/*Nonzero if an error occurred.*/
|
||||
|
@ -95,7 +95,7 @@ static inline void ec_reset(ec_ctx *_this){
|
|||
_this->offs=_this->end_offs=0;
|
||||
}
|
||||
|
||||
static inline celt_uint32 ec_range_bytes(ec_ctx *_this){
|
||||
static inline opus_uint32 ec_range_bytes(ec_ctx *_this){
|
||||
return _this->offs;
|
||||
}
|
||||
|
||||
|
@ -123,6 +123,6 @@ static inline int ec_tell(ec_ctx *_this){
|
|||
Return: The number of bits scaled by 2**BITRES.
|
||||
This will always be slightly larger than the exact value (e.g., all
|
||||
rounding error is in the positive direction).*/
|
||||
celt_uint32 ec_tell_frac(ec_ctx *_this);
|
||||
opus_uint32 ec_tell_frac(ec_ctx *_this);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue