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

Add ec_dec_tell() to report the same information as ec_enc_tell() decode side. Remove ec_enc_tell() and replace it with ec_enc_tellf(): just request 0 fractional bits if you want an integer value.

Browse source 
git-svn-id: http://svn.xiph.org/trunk/ghost@14394 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
tterribe 2008-01-11 05:51:49 +00:00 • committed by Jean-Marc Valin
parent fad779ca56
commit 3eff11d8d4
7 changed files with 111 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libentcode/ectest.c
View file

@ -11,6 +11,7 @@ int main(int _argc,char **_argv){
ec_probmod mod;
ec_uint64 sym64;
long nbits;
long nbits2;
double entropy;
int ft;
int ftb;
@ -33,12 +34,10 @@ int main(int _argc,char **_argv){
/*Testing encoding of raw bit values.*/
for(ftb=0;ftb<16;ftb++){
for(i=0;i<(1<<ftb);i++){
long nbits;
long nbits2;
entropy+=ftb;
nbits=ec_enc_tell(&enc);
nbits=ec_enc_tell(&enc,0);
ec_enc_bits(&enc,i,ftb);
nbits2=ec_enc_tell(&enc);
nbits2=ec_enc_tell(&enc,0);
if(nbits2-nbits!=ftb){
fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
nbits2-nbits,ftb);
@ -46,7 +45,7 @@ int main(int _argc,char **_argv){
entropy+=ftb+30;
nbits=nbits2;
ec_enc_bits64(&enc,(ec_uint64)i<<30|i,ftb+30);
nbits2=ec_enc_tell(&enc);
nbits2=ec_enc_tell(&enc,0);
if(nbits2-nbits!=ftb+30){
fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
nbits2-nbits,ftb+30);
@ -73,7 +72,7 @@ int main(int _argc,char **_argv){
}
ec_probmod_clear(&mod);
}
nbits=ec_enc_tellf(&enc,4);
nbits=ec_enc_tell(&enc,4);
ec_enc_done(&enc);
fprintf(stderr,
"Encoded %0.2lf bits of entropy to %0.2lf bits (%0.3lf%% wasted).\n",
@ -133,6 +132,12 @@ int main(int _argc,char **_argv){
}
ec_probmod_clear(&mod);
}
nbits2=ec_dec_tell(&dec,4);
if(nbits!=nbits2){
fprintf(stderr,
"Reported number of bits used was %0.2lf, should be %0.2lf.\n",
ldexp(nbits2,-4),ldexp(nbits,-4));
}
ec_byte_writeclear(&buf);
fprintf(stderr,"All tests passed.\n");
return 0;