[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec vp3dsp.c, 1.3, 1.4 vp3.c, 1.45, 1.46

[Michael Niedermayer CVS]

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

Modified Files:
	vp3dsp.c vp3.c 
Log Message:
remove permutation done to quant tables and then undone during idct
move permutation from idct to unpack_vlcs


Index: vp3dsp.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3dsp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vp3dsp.c	18 May 2004 17:09:46 -0000	1.3
+++ vp3dsp.c	17 May 2005 09:18:49 -0000	1.4
@@ -53,11 +53,10 @@
     int32_t t1, t2;
 
     int i, j;
-
+    
     /* de-zigzag and dequantize */
     for (i = 0; i < coeff_count; i++) {
-        j = dezigzag_index[i];
-        dequantized_data[j] = dequant_matrix[i] * input_data[i];
+        dequantized_data[i] = dequant_matrix[i] * input_data[i];
     }
 
     /* Inverse DCT on the rows now */

Index: vp3.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- vp3.c	17 May 2005 08:46:40 -0000	1.45
+++ vp3.c	17 May 2005 09:18:49 -0000	1.46
@@ -886,7 +886,7 @@
      * the dequantization phase */
     for (i = 1; i < 64; i++) {
 
-        j = zigzag_index[i];
+        j = i;
 
         s->intra_y_dequant[j] = s->coded_intra_y_dequant[i] * ac_scale_factor / 100;
         if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL)
@@ -1659,7 +1659,7 @@
         if (!eob_run) {
             fragment->coeff_count += zero_run;
             if (fragment->coeff_count < 64)
-                fragment->coeffs[fragment->coeff_count++] = coeff;
+                fragment->coeffs[dezigzag_index[fragment->coeff_count++]] = coeff;
             debug_vlc(" fragment %d coeff = %d\n",
                 s->coded_fragment_list[i], fragment->coeffs[coeff_index]);
         } else {