[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec vorbis.c,1.8,1.9

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv25599

Modified Files:
	vorbis.c 
Log Message:
maxdepth is supposed to be a constant, its faster if its too large then if its non constant


Index: vorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vorbis.c	30 May 2005 15:03:06 -0000	1.8
+++ vorbis.c	30 May 2005 19:14:50 -0000	1.9
@@ -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<cdim;++j) {
@@ -909,7 +909,7 @@
             cval=cval>>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;j<ch_used;++j) {
                     if (!do_not_decode[j]) {
                         uint_fast32_t temp=get_vlc2(gb, vc->codebooks[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;k<step;++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;l<vc->codebooks[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;k<vr->partition_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;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) {
                                         vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l];  // FPMATH
 
@@ -1150,7 +1150,7 @@
 
                                 for(k=0;k<vr->partition_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;l<vc->codebooks[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;k<vr->partition_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;l<vc->codebooks[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 %