eden-emu/opus
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate the ec_int32 and ec_uint32 typedefs.

Browse source 
These were used because the entropy coder originally came from
 outside libcelt, and thus did not have a common type system.
It's now undergone enough modification that it's not ever likely to
 be used as-is in another codec without some porting effort, so
 there's no real reason to maintain the typedefs separately.
Hopefully we'll replace these all again somedate with a common set
 of Opus typedefs, but for now this will do.

This fixes an issue caused by commit 6c8acbf1, which moved the
 ec_ilog() prototype from entcode.h to ecintrin.h, where the
 ec_uint32 typedef was not yet available.
Thanks to John Ridges for the report.
This commit is contained in:
Timothy B. Terriberry 2011-03-02 16:24:32 -08:00 • committed by Jean-Marc Valin
parent 115fa35a9d
commit 9bac8c17d5
15 changed files with 83 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libcelt/entcode.c
View file

@ -34,7 +34,7 @@
#if !defined(EC_CLZ)
int ec_ilog(ec_uint32 _v){
int ec_ilog(celt_uint32 _v){
/*On a Pentium M, this branchless version tested as the fastest on
1,000,000,000 random 32-bit integers, edging out a similar version with
branches, and a 256-entry LUT version.*/
@ -59,11 +59,11 @@ int ec_ilog(ec_uint32 _v){
#endif
ec_uint32 ec_tell_frac(ec_ctx *_this){
ec_uint32 nbits;
ec_uint32 r;
int l;
int i;
celt_uint32 ec_tell_frac(ec_ctx *_this){
celt_uint32 nbits;
celt_uint32 r;
int l;
int i;
/*To handle the non-integral number of bits still left in the encoder/decoder
state, we compute the worst-case number of bits of val that must be
encoded to ensure that the value is inside the range for any possible