# HG changeset patch # User michael # Date 1117480490 0 # Node ID d5ac91dafaa8781efdbede73f5b8dead265da465 # Parent 977209c4cc545dc97af552d28c7fcf6ba2607362 maxdepth is supposed to be a constant, its faster if its too large then if its non constant diff -r 977209c4cc54 -r d5ac91dafaa8 vorbis.c --- a/vorbis.c Mon May 30 15:03:06 2005 +0000 +++ b/vorbis.c Mon May 30 19:14:50 2005 +0000 @@ -898,7 +898,7 @@ if (cbits) { // this reads all subclasses for this partition's class cval=get_vlc2(gb, vc->codebooks[vf->class_masterbook[class_]].vlc.table, - V_NB_BITS, vc->codebooks[vf->class_masterbook[class_]].maxdepth); + V_NB_BITS, 3); } for(j=0;j>cbits; if (book>0) { floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table, - V_NB_BITS, vc->codebooks[book].maxdepth); + V_NB_BITS, 3); } else { floor1_Y[offset+j]=0; } @@ -1095,7 +1095,7 @@ for(j_times_ptns_to_read=0, j=0;jcodebooks[vr->classbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth); + V_NB_BITS, 3); AV_DEBUG("Classword: %d \n", temp); @@ -1127,7 +1127,7 @@ voffs=voffset+j*vlen; for(k=0;kcodebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;lcodebooks[vqbook].dimensions;++l) { vec[voffs+k+l*step]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH } @@ -1137,7 +1137,7 @@ voffs=voffset+j*vlen; for(k=0;kpartition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;lcodebooks[vqbook].dimensions;++l, ++voffs) { vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH @@ -1150,7 +1150,7 @@ for(k=0;kpartition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;lcodebooks[vqbook].dimensions;++l, ++voffs) { vec[(voffs>>1)+((voffs&1) ? vlen : 0)]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH @@ -1164,7 +1164,7 @@ for(k=0;kpartition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;lcodebooks[vqbook].dimensions;++l, ++voffs) { vec[voffs/ch+(voffs%ch)*vlen]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and %