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

More simplifications to the decoder renormalization loop.

Browse source 
This removes an XOR, an ADD, and an AND, and replaces them with
 an AND NOT in ec_dec_normalize().
Also, simplify the loop structure of ec_dec_cdf() and eliminate a
 CMOV.
This commit is contained in:
Timothy B. Terriberry 2010-12-18 04:51:55 -08:00 • committed by Jean-Marc Valin
parent e86fb268b0
commit 53454f4910
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libcelt/rangedec.c
View file

@ -121,16 +121,13 @@ static inline void ec_dec_normalize(ec_dec *_this){
int sym; int sym;
_this->rng<<=EC_SYM_BITS; _this->rng<<=EC_SYM_BITS;
/*Use up the remaining bits from our last symbol.*/ /*Use up the remaining bits from our last symbol.*/
sym=_this->rem<<EC_CODE_EXTRA&EC_SYM_MAX; sym=_this->rem<<EC_CODE_EXTRA;
/*Read the next value from the input.*/ /*Read the next value from the input.*/
_this->rem=ec_dec_in(_this); _this->rem=ec_dec_in(_this);
/*Take the rest of the bits we need from this new symbol.*/ /*Take the rest of the bits we need from this new symbol.*/
sym|=_this->rem>>EC_SYM_BITS-EC_CODE_EXTRA; sym|=_this->rem>>EC_SYM_BITS-EC_CODE_EXTRA;
_this->dif=(_this->dif<<EC_SYM_BITS)-sym+((1<<EC_SYM_BITS)-1)&EC_CODE_MASK; /*And subtract them from dif, capped to be less than EC_CODE_TOP.*/
/*dif must be smaller than EC_CODE_TOP. _this->dif=(_this->dif<<EC_SYM_BITS)+(EC_SYM_MAX&~sym)&EC_CODE_TOP-1;
This is equivalent to the slightly more readable:
if(_this->dif>=EC_CODE_TOP)_this->dif-=EC_CODE_TOP;*/
_this->dif^=_this->dif&EC_CODE_TOP;
} }
} }
@ -225,20 +222,19 @@ int ec_dec_cdf(ec_dec *_this,const int *_cdf,unsigned _ftb){
ec_uint32 s; ec_uint32 s;
ec_uint32 t; ec_uint32 t;
int val; int val;
r=_this->rng>>_ftb; s=_this->rng;
d=_this->dif; d=_this->dif;
_cdf++; r=s>>_ftb;
val=0; val=0;
t=0; do{
s=IMUL32(r,(1<<_ftb)-_cdf[0]);
while(d<s){
t=s; t=s;
s=IMUL32(r,(1<<_ftb)-_cdf[++val]); s=IMUL32(r,(1<<_ftb)-_cdf[++val]);
} }
while(d<s);
_this->dif=d-s; _this->dif=d-s;
_this->rng=(val?t:_this->rng)-s; _this->rng=t-s;
ec_dec_normalize(_this); ec_dec_normalize(_this);
return val; return val-1;
} }
ec_uint32 ec_dec_tell(ec_dec *_this,int _b){ ec_uint32 ec_dec_tell(ec_dec *_this,int _b){