X-Git-Url: https://git.xiph.org/?p=opus.git;a=blobdiff_plain;f=libcelt%2Fentdec.h;h=719fdb24145bf86a5aab6efc48a0e1e3faa0d5be;hp=593979b17c755d2c535934292e8e50676a6c06d4;hb=5c3d155188366f02a1dd7ecdcb055ef7df4f20c0;hpb=93839b636d0a1801950bf1ddf52e52cc12b6391a diff --git a/libcelt/entdec.h b/libcelt/entdec.h index 593979b1..719fdb24 100644 --- a/libcelt/entdec.h +++ b/libcelt/entdec.h @@ -30,12 +30,10 @@ # include # include "entcode.h" - - /*Initializes the decoder. _buf: The input buffer to use. Return: 0 on success, or a negative value on error.*/ -void ec_dec_init(ec_dec *_this,unsigned char *_buf,celt_uint32 _storage); +void ec_dec_init(ec_dec *_this,unsigned char *_buf,opus_uint32 _storage); /*Calculates the cumulative frequency for the next symbol. This can then be fed into the probability model to determine what that @@ -89,7 +87,7 @@ int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb); _ft: The number of integers that can be decoded (one more than the max). This must be at least one, and no more than 2**32-1. Return: The decoded bits.*/ -celt_uint32 ec_dec_uint(ec_dec *_this,celt_uint32 _ft); +opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft); /*Extracts a sequence of raw bits from the stream. The bits must have been encoded with ec_enc_bits(). @@ -97,6 +95,6 @@ celt_uint32 ec_dec_uint(ec_dec *_this,celt_uint32 _ft); _ftb: The number of bits to extract. This must be between 0 and 25, inclusive. Return: The decoded bits.*/ -celt_uint32 ec_dec_bits(ec_dec *_this,unsigned _ftb); +opus_uint32 ec_dec_bits(ec_dec *_this,unsigned _ftb); #endif