[Ffmpeg-cvslog] r7342 - in trunk: libavcodec/h263.c tests/ffmpeg.regression.ref tests/rotozoom.regression.ref

[michael]

Author: michael
Date: Thu Dec 21 15:24:23 2006
New Revision: 7342

Modified:
   trunk/libavcodec/h263.c
   trunk/tests/ffmpeg.regression.ref
   trunk/tests/rotozoom.regression.ref

Log:
dont randomly disallow intr4v in adaptive quant
  some PSNR/bitrate gain if adaptive quant is used
initalize qscale_table correctly (it was pretty much random since the qp->lambda change)
  this probably has not much effect as the table isnt used currently IIRC


Modified: trunk/libavcodec/h263.c
==============================================================================
--- trunk/libavcodec/h263.c	(original)
+++ trunk/libavcodec/h263.c	Thu Dec 21 15:24:23 2006
@@ -487,12 +487,28 @@
 }
 
 /**
+ * init s->current_picture.qscale_table from s->lambda_table
+ */
+static void ff_init_qscale_tab(MpegEncContext *s){
+    int8_t * const qscale_table= s->current_picture.qscale_table;
+    int i;
+
+    for(i=0; i<s->mb_num; i++){
+        unsigned int lam= s->lambda_table[ s->mb_index2xy[i] ];
+        int qp= (lam*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7);
+        qscale_table[ s->mb_index2xy[i] ]= clip(qp, s->avctx->qmin, s->avctx->qmax);
+    }
+}
+
+/**
  * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2)
  */
 void ff_clean_h263_qscales(MpegEncContext *s){
     int i;
     int8_t * const qscale_table= s->current_picture.qscale_table;
 
+    ff_init_qscale_tab(s);
+
     for(i=1; i<s->mb_num; i++){
         if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i-1] ] >2)
             qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i-1] ]+2;
@@ -507,7 +523,6 @@
             int mb_xy= s->mb_index2xy[i];
 
             if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTER4V)){
-                s->mb_type[mb_xy]&= ~CANDIDATE_MB_TYPE_INTER4V;
                 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_INTER;
             }
         }

Modified: trunk/tests/ffmpeg.regression.ref
==============================================================================
--- trunk/tests/ffmpeg.regression.ref	(original)
+++ trunk/tests/ffmpeg.regression.ref	Thu Dec 21 15:24:23 2006
@@ -79,10 +79,10 @@
 657582 ./data/a-mpeg4-qprd.avi
 5b620f592a795b1caad323ab3fab0859 *./data/out.yuv
 stddev: 12.12 PSNR:26.45 bytes:7602176
-b41b9915af65da1c03f17f59a1806d0e *./data/a-mpeg4-adap.avi
-400192 ./data/a-mpeg4-adap.avi
-9dffb8079a1666c054514ab02d9d4871 *./data/out.yuv
-stddev: 14.68 PSNR:24.78 bytes:7602176
+94c5a5e14f51e04b173d72eb0648b206 *./data/a-mpeg4-adap.avi
+400190 ./data/a-mpeg4-adap.avi
+8e5842fc2b92afa362bfcf17f339d47f *./data/out.yuv
+stddev: 14.67 PSNR:24.79 bytes:7602176
 5fff534f0b958547dfdb811d4f289931 *./data/a-mpeg4-thread.avi
 761170 ./data/a-mpeg4-thread.avi
 fe1d119938f8a26174b38eeaa18dff85 *./data/out.yuv

Modified: trunk/tests/rotozoom.regression.ref
==============================================================================
--- trunk/tests/rotozoom.regression.ref	(original)
+++ trunk/tests/rotozoom.regression.ref	Thu Dec 21 15:24:23 2006
@@ -79,10 +79,10 @@
 235016 ./data/a-mpeg4-qprd.avi
 224969c07440a23b376521c484936e75 *./data/out.yuv
 stddev:  4.24 PSNR:35.56 bytes:7602176
-62c7e87076d4741eb99d76e3ec424db0 *./data/a-mpeg4-adap.avi
-205456 ./data/a-mpeg4-adap.avi
-fe20d6bd1aa019196fb6426fdd0f4779 *./data/out.yuv
-stddev:  4.08 PSNR:35.91 bytes:7602176
+7ecfbb848740d316e2fcf573b32cb848 *./data/a-mpeg4-adap.avi
+205454 ./data/a-mpeg4-adap.avi
+c9225addf2e620e0094d26e805693af1 *./data/out.yuv
+stddev:  4.05 PSNR:35.96 bytes:7602176
 8cd8940d7451925784536fe9b2f2a5e3 *./data/a-mpeg4-thread.avi
 254260 ./data/a-mpeg4-thread.avi
 d160a4224ea1af66c85178912f8d3a7c *./data/out.yuv