change qscale -> lambda for the motion estimation

finetune bit/distortion weighting factor used in motion estimation, the old coeffs where finetuned relative to incorrect mv_penalty tables which where then fixed later but the coeffs where not
this _may_ fix the long standing blocking artifacts, but may also introduce mudding artefacts theoretically, so please tell us if u stumble across any so we can either fix them or export this variable so the user can change it

Originally committed as revision 3189 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 202 insertions, 203 deletions

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index d2ab2b2e65..b92b6dfad8 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -223,18 +223,17 @@ static inline int get_penalty_factor(MpegEncContext *s, int type){
     switch(type&0xFF){
     default:
     case FF_CMP_SAD:
-        return s->qscale*2;
+        return s->lambda>>FF_LAMBDA_SHIFT;
     case FF_CMP_DCT:
-        return s->qscale*3;
+        return (3*s->lambda)>>(FF_LAMBDA_SHIFT+1);
     case FF_CMP_SATD:
-        return s->qscale*6;
+        return (2*s->lambda)>>FF_LAMBDA_SHIFT;
+    case FF_CMP_RD:
+    case FF_CMP_PSNR:
     case FF_CMP_SSE:
-        return s->qscale*s->qscale*2;
+        return s->lambda2>>FF_LAMBDA_SHIFT;
     case FF_CMP_BIT:
         return 1;
-    case FF_CMP_RD:
-    case FF_CMP_PSNR:
-        return (s->qscale*s->qscale*185 + 64)>>7;
     }
 }
 
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4bc15ef2fa..a0d0c8b62d 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -4623,7 +4623,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
         
     s->me.scene_change_score=0;
     
-    s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
+//    s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
     
     if(s->pict_type==I_TYPE){
         if(s->msmpeg4_version >= 3) s->no_rounding=1;
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index a3fe4f4549..aa3cbec58b 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -1,84 +1,84 @@
 ffmpeg regression test
-8fa6d3f1c07df017507508e5b4f66580 *./data/a-mpeg1.mpg
- 731734 ./data/a-mpeg1.mpg
-85d76325d3eda9e9db6480f340f5dcd8 *./data/out.yuv
+511897938cd4a9dd5d0ab38b4658be18 *./data/a-mpeg1.mpg
+734274 ./data/a-mpeg1.mpg
+eff964f940a35427fa9e8d35fb4f5699 *./data/out.yuv
 stddev:  7.66 PSNR:30.43 bytes:7602176
-d407d83f6fa7c98468a6f69a40bdc6a0 *./data/a-mpeg2.mpg
- 743765 ./data/a-mpeg2.mpg
-d2421f070ffc974735cb53d3cac687c7 *./data/out.yuv
-stddev:  7.68 PSNR:30.41 bytes:7602176
-b7d78c9f045e063707ad51d71f597885 *./data/a-mpeg2.mpg
- 742810 ./data/a-mpeg2.mpg
-4ea5aada565f1ef35cdf1d461fc5534d *./data/out.yuv
-stddev:  7.68 PSNR:30.40 bytes:7602176
-d295328b9860a8daf49e783e7644b566 *./data/a-mpeg2i.mpg
- 741714 ./data/a-mpeg2i.mpg
-4acf1008a49f18b9ab632d2470bdc22a *./data/out.yuv
-stddev:  7.70 PSNR:30.39 bytes:7602176
-6c56dbcc64f2f4ba27d4c6192365524b *./data/a-mpeg2thread.mpg
- 774546 ./data/a-mpeg2thread.mpg
-d0fe7723b7379f7c9d565b79207655ca *./data/out.yuv
-stddev:  9.45 PSNR:28.61 bytes:7299072
-1a919f76063089fef246790165b34e37 *./data/a-msmpeg4v2.avi
- 634430 ./data/a-msmpeg4v2.avi
-2425680bd5c78671e03d2fee4563d98b *./data/out.yuv
-stddev:  8.03 PSNR:30.02 bytes:7602176
-bff91a624ca3996ea3456811911e6eaf *./data/a-msmpeg4.avi
- 633466 ./data/a-msmpeg4.avi
-3e99954eafce6f339558a8703f2ffb51 *./data/out.yuv
-stddev:  8.03 PSNR:30.02 bytes:7602176
-cd2638da04fab94255c4198362ca9b65 *./data/a-wmv1.avi
- 636270 ./data/a-wmv1.avi
-a58f8ab3f3735b3f1cc6c08917bb3ef3 *./data/out.yuv
-stddev:  8.03 PSNR:30.02 bytes:7602176
-8729cdb1d0c0f67f601c3326e3042709 *./data/a-wmv2.avi
- 671464 ./data/a-wmv2.avi
-a58f8ab3f3735b3f1cc6c08917bb3ef3 *./data/out.yuv
-stddev:  8.03 PSNR:30.02 bytes:7602176
-6febe9fd5e4fb1077fc56b4d69a92e56 *./data/a-h263.avi
- 676372 ./data/a-h263.avi
-bb31a08b20cfabc5332d11938e2f9352 *./data/out.yuv
-stddev:  8.09 PSNR:29.96 bytes:7602176
-fea5b6c80b5e345cc48f72257814d7b8 *./data/a-h263p.avi
-2398342 ./data/a-h263p.avi
-c6e070fb9505018402c5b87b8b12699d *./data/out.yuv
-stddev:  2.07 PSNR:41.77 bytes:7602176
-aaa3b1355e276def2133ecb4d1db74ed *./data/a-odivx.mp4
-562315 ./data/a-odivx.mp4
-33d3e1f41f1dcb99676e661ba9aa766f *./data/out.yuv
-stddev:  8.05 PSNR:30.00 bytes:7602176
+5e1e8136cf2565f7cfbcfc7eda8d8f2b *./data/a-mpeg2.mpg
+750226 ./data/a-mpeg2.mpg
+27ddfd3e44537661eb14b96129a055ef *./data/out.yuv
+stddev:  7.69 PSNR:30.40 bytes:7602176
+004245d17ae9322ea3c6dc4b0f0554d6 *./data/a-mpeg2.mpg
+746381 ./data/a-mpeg2.mpg
+c7b9a71245912671889849ed560b67d3 *./data/out.yuv
+stddev:  7.69 PSNR:30.40 bytes:7602176
+2a77ebec455e17c4ab897044c9b3040a *./data/a-mpeg2i.mpg
+754366 ./data/a-mpeg2i.mpg
+ddf889858529d09c8fe31c701deacd16 *./data/out.yuv
+stddev:  7.71 PSNR:30.37 bytes:7602176
+66e401951a0641835aed5b0b431cda20 *./data/a-mpeg2thread.mpg
+787416 ./data/a-mpeg2thread.mpg
+ab64753cc7d0deb690dab4f5b0eb3e52 *./data/out.yuv
+stddev:  9.46 PSNR:28.60 bytes:7299072
+e7ff3a8780ebdc6687352646c8fbe876 *./data/a-msmpeg4v2.avi
+642666 ./data/a-msmpeg4v2.avi
+7646e5cc93452b5fb380c8c4c5f535f4 *./data/out.yuv
+stddev:  8.02 PSNR:30.03 bytes:7602176
+acd696f8967a996b3fbcfac94dd0d889 *./data/a-msmpeg4.avi
+644964 ./data/a-msmpeg4.avi
+cdc5d7403a16dc9450a2dbacb349dc70 *./data/out.yuv
+stddev:  8.01 PSNR:30.04 bytes:7602176
+82ca511f87695a1ee24c1681fed75bfa *./data/a-wmv1.avi
+648074 ./data/a-wmv1.avi
+09253222ab4eb95628c931a86006a2b1 *./data/out.yuv
+stddev:  8.02 PSNR:30.04 bytes:7602176
+a5bd577163968edab00058f2c8d5efab *./data/a-wmv2.avi
+682132 ./data/a-wmv2.avi
+09253222ab4eb95628c931a86006a2b1 *./data/out.yuv
+stddev:  8.02 PSNR:30.04 bytes:7602176
+fa556e599181bf9328a811a1ce9aa022 *./data/a-h263.avi
+682226 ./data/a-h263.avi
+f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv
+stddev:  8.08 PSNR:29.97 bytes:7602176
+fb27fbe102cae4d8b7c47955db87b11d *./data/a-h263p.avi
+2414342 ./data/a-h263p.avi
+28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
+stddev:  2.07 PSNR:41.76 bytes:7602176
+9153a152c1937cfb453b0388a1621a05 *./data/a-odivx.mp4
+554440 ./data/a-odivx.mp4
+e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv
+stddev:  7.99 PSNR:30.06 bytes:7602176
 5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi
 5986168 ./data/a-huffyuv.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-a86d267dceb37beca514484ad5951675 *./data/a-mpeg4-rc.avi
-816350 ./data/a-mpeg4-rc.avi
-11efbbf01c8473ac5eabd775f1c0bec5 *./data/out.yuv
-stddev: 11.51 PSNR:26.89 bytes:7299072
-451bd18acf3c169301c215a63a3b216d *./data/a-mpeg4-adv.avi
- 592570 ./data/a-mpeg4-adv.avi
-9f4fbff593dd0bd7ad437ceee4afc11f *./data/out.yuv
-stddev: 10.31 PSNR:27.85 bytes:7602176
-b99438023ff9dda75494b4095c42affa *./data/a-mpeg4-thread.avi
-752360 ./data/a-mpeg4-thread.avi
-51b7bfb3cbf1580eefc61e610451e67e *./data/out.yuv
-stddev: 13.17 PSNR:25.72 bytes:7299072
-4f1ca5927928b8433bfcb5f231239462 *./data/a-mpeg4-Q.avi
-875916 ./data/a-mpeg4-Q.avi
-dca5adb5fca49a806e71266f1a04c3a5 *./data/out.yuv
-stddev:  8.15 PSNR:29.89 bytes:7299072
-771f65ff24c0d32b37f2663892b2f433 *./data/a-error-mpeg4-adv.avi
- 767796 ./data/a-error-mpeg4-adv.avi
-a25db8ad6a845e97fd4eb1e8bf343b73 *./data/out.yuv
-stddev: 18.04 PSNR:22.99 bytes:7602176
-dccfbd47aad26b096c9857bfb251ec85 *./data/a-mpeg4-nr.avi
- 696490 ./data/a-mpeg4-nr.avi
-67f8e8839fd8354e8f08661e3a7fdb88 *./data/out.yuv
-stddev:  7.04 PSNR:31.17 bytes:7602176
-dea1962da88ad3922a9c222bec94a3c1 *./data/a-mpeg1b.mpg
- 975624 ./data/a-mpeg1b.mpg
-cb6358640f9c3f9cbc6bbccef544374a *./data/out.yuv
-stddev: 10.07 PSNR:28.06 bytes:7145472
+a82721d3e965020e16ca9354767ab853 *./data/a-mpeg4-rc.avi
+817482 ./data/a-mpeg4-rc.avi
+80ea28004d9f89fde320fd30fc849f9a *./data/out.yuv
+stddev: 11.46 PSNR:26.93 bytes:7299072
+8a7d825829de0e1f1b79beba342b60a9 *./data/a-mpeg4-adv.avi
+600240 ./data/a-mpeg4-adv.avi
+0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv
+stddev: 10.25 PSNR:27.90 bytes:7602176
+0dccb9234c119071183759b5c9bd21db *./data/a-mpeg4-thread.avi
+752696 ./data/a-mpeg4-thread.avi
+aa653080b4871b6e79b64514372fc99d *./data/out.yuv
+stddev: 13.15 PSNR:25.74 bytes:7299072
+3d6dcb71643f05c757714bd29e113e81 *./data/a-mpeg4-Q.avi
+873598 ./data/a-mpeg4-Q.avi
+5798dea8ebb87bbdd3ee71845f4813b1 *./data/out.yuv
+stddev:  8.14 PSNR:29.90 bytes:7299072
+bd3868a0b2a1e5963985e3d18b182c50 *./data/a-error-mpeg4-adv.avi
+750788 ./data/a-error-mpeg4-adv.avi
+83c96db61822c4ee2b9d46f1055264c5 *./data/out.yuv
+stddev: 17.22 PSNR:23.40 bytes:7602176
+375f4bf18d72549acb28452339eabc70 *./data/a-mpeg4-nr.avi
+689772 ./data/a-mpeg4-nr.avi
+79f4e8263e40822c0cbf35725f375b24 *./data/out.yuv
+stddev:  7.03 PSNR:31.18 bytes:7602176
+10489a136a5a96794160b56ec3560f20 *./data/a-mpeg1b.mpg
+985028 ./data/a-mpeg1b.mpg
+bb8f851718115b248572bea5fc2e2e32 *./data/out.yuv
+stddev: 10.07 PSNR:28.05 bytes:7145472
 07042f42b3119c39eb26537a84a451df *./data/a-mjpeg.avi
 1437768 ./data/a-mjpeg.avi
 f23a9e50a559e174766ee808c48fea22 *./data/out.yuv
@@ -87,10 +87,10 @@ stddev:  8.87 PSNR:29.15 bytes:7602176
 6262762 ./data/a-ljpeg.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-4fcfeba819177ad440bd16b0f095ba45 *./data/a-rv10.rm
- 671633 ./data/a-rv10.rm
-bb31a08b20cfabc5332d11938e2f9352 *./data/out.yuv
-stddev:  8.09 PSNR:29.96 bytes:7602176
+5f51e30b621683e59edbab2e7c3f8c36 *./data/a-rv10.rm
+677483 ./data/a-rv10.rm
+f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv
+stddev:  8.08 PSNR:29.97 bytes:7602176
 89ad858355f9b0a92d024c5ba6e369dd *./data/a-asv1.avi
 2292416 ./data/a-asv1.avi
 b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv
@@ -99,10 +99,10 @@ stddev: 19.19 PSNR:22.46 bytes:7602176
 2221012 ./data/a-asv2.avi
 551b263bfb2acb9ea6dd2000f184494f *./data/out.yuv
 stddev: 17.98 PSNR:23.02 bytes:7602176
-0bf9da6639ff5e7d4e02143ca05258f4 *./data/a-flv.flv
- 650791 ./data/a-flv.flv
-1f9ec1f6c8c5ad795c44183b225d842c *./data/out.yuv
-stddev:  8.09 PSNR:29.96 bytes:7602176
+de42cb5a15bfa8e70cf60edda0b32355 *./data/a-flv.flv
+657991 ./data/a-flv.flv
+4d9c04e7017dc68da7891048c46c1c37 *./data/out.yuv
+stddev:  8.08 PSNR:29.97 bytes:7602176
 0ed9b02681d6d44bf8c390ba6c4f5c66 *./data/a-ffv1.avi
 2653690 ./data/a-ffv1.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index d1d5b9ea07..d1deeb019d 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -1,35 +1,35 @@
 ffmpeg regression test
-c23bbe3016afcb726a494858b7bb17e3 *./data/b-libav.avi
- 337732 ./data/b-libav.avi
-./data/b-libav.avi CRC=658838d9
-a09d8460b207c4a67a26842c70fbb060 *./data/b-libav.asf
- 339767 ./data/b-libav.asf
-./data/b-libav.asf CRC=4b9f25a1
-be8eb1b5705c8105e4727258e448cb24 *./data/b-libav.rm
- 356950 ./data/b-libav.rm
-4edcd572ffc30b7a7b95b6a38f157b20 *./data/b-libav.mpg
-385024 ./data/b-libav.mpg
-./data/b-libav.mpg CRC=8b9ae29e
-01a4130e776b8955fa99e477113e94fd *./data/b-libav.swf
-  41743 ./data/b-libav.swf
-./data/b-libav.swf CRC=eaaf4640
-f13889dd08a4968e2b783771c7a29229 *./data/b-libav.ffm
- 389120 ./data/b-libav.ffm
-./data/b-libav.ffm CRC=94c26232
-9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv
- 336334 ./data/b-libav.flv
-./data/b-libav.flv CRC=8a731c32
-98d03f5df0229bb1a89dd25f9165e3db *./data/b-libav.mov
-365313 ./data/b-libav.mov
-./data/b-libav.mov CRC=1bd6add1
-fbabd2eb07408449076ee2d07f63e81f *./data/b-libav.nut
-327836 ./data/b-libav.nut
-./data/b-libav.nut CRC=658838d9
-06068b228604718b7dd6ec17a2f5cee2 *./data/b-libav.dv
+23df749712744cac9593514510707c0d *./data/b-libav.avi
+342282 ./data/b-libav.avi
+./data/b-libav.avi CRC=001a3415
+80f85b6dce1da8310a49bb4607a34f06 *./data/b-libav.asf
+342967 ./data/b-libav.asf
+./data/b-libav.asf CRC=750f18c7
+1cbf838e659d7fc3d3e33f4187b91f6c *./data/b-libav.rm
+360251 ./data/b-libav.rm
+e0a9ed22a34e0277ec77c84e8b64afd9 *./data/b-libav.mpg
+387072 ./data/b-libav.mpg
+./data/b-libav.mpg CRC=ac661eb1
+57a8dfc7926802bb337a9d8918de94a8 *./data/b-libav.swf
+41816 ./data/b-libav.swf
+./data/b-libav.swf CRC=2b273fea
+b57e3c4e0f27cbd0bf7b7fafb142fe7f *./data/b-libav.ffm
+389120 ./data/b-libav.ffm
+./data/b-libav.ffm CRC=f765cbdd
+794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv
+339325 ./data/b-libav.flv
+./data/b-libav.flv CRC=7b9076f8
+95a85df5f6cc6745235298e56920e3f4 *./data/b-libav.mov
+369865 ./data/b-libav.mov
+./data/b-libav.mov CRC=48f5a90d
+7d75403dd8fead169b92c18be36e7116 *./data/b-libav.nut
+332388 ./data/b-libav.nut
+./data/b-libav.nut CRC=001a3415
+25b1c16cce152be411351dd092668d88 *./data/b-libav.dv
 3600000 ./data/b-libav.dv
 ./data/b-libav.dv CRC=74d854aa
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
- 317075 ./data/b-libav.pbm
+317075 ./data/b-libav.pbm
 ./data/b-libav.pbm CRC=a1057fd1
 6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm
 2534775 ./data/b-libav.pgm
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index e55dc051c7..f741915271 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -1,96 +1,96 @@
 ffmpeg regression test
-c6b36c115af94ee79676127b48151d59 *./data/a-mpeg1.mpg
- 196733 ./data/a-mpeg1.mpg
-9694a38d15c5f1354112870b0709e800 *./data/out.yuv
-stddev:  5.03 PSNR:34.07 bytes:7602176
-8a7a3b90f1fac5e207f3e9e3cdf11197 *./data/a-mpeg2.mpg
- 202489 ./data/a-mpeg2.mpg
-686d5937aec5c8ffd3a7be5363580b79 *./data/out.yuv
-stddev:  5.05 PSNR:34.04 bytes:7602176
-7b9333730f9a1ca89134b9b1c55700d3 *./data/a-mpeg2.mpg
- 201885 ./data/a-mpeg2.mpg
-acd0d0f73b95d5a4ed5da34e567e4a6e *./data/out.yuv
-stddev:  5.05 PSNR:34.04 bytes:7602176
-3f5ee459440c4bc5f9fd8f53e2591073 *./data/a-mpeg2i.mpg
- 208342 ./data/a-mpeg2i.mpg
-07f678cfa5f1c81657dadbc820d20841 *./data/out.yuv
-stddev:  5.06 PSNR:34.02 bytes:7602176
-6771f3dc7a0e2b724154d4b199d6a444 *./data/a-mpeg2thread.mpg
- 179576 ./data/a-mpeg2thread.mpg
-9c84329b36d4faf8b8f4a3b810f29f92 *./data/out.yuv
-stddev:  5.65 PSNR:33.07 bytes:7299072
-6ba5ea7ae12d98a2dc85cbb928f31e77 *./data/a-msmpeg4v2.avi
- 132626 ./data/a-msmpeg4v2.avi
-ab4f0d19340243a1881ae370579a37eb *./data/out.yuv
+88288ad1598d634386c91a7e4b83d099 *./data/a-mpeg1.mpg
+193481 ./data/a-mpeg1.mpg
+ce245faede79604bb268f93689a490d6 *./data/out.yuv
+stddev:  4.96 PSNR:34.21 bytes:7602176
+a59a2a0d04768b9dcd51ab13f751f0ef *./data/a-mpeg2.mpg
+199231 ./data/a-mpeg2.mpg
+bccb76fc30fca87cc401e41f4c0ef154 *./data/out.yuv
+stddev:  4.97 PSNR:34.18 bytes:7602176
+eba2bff497863dbe8dad4a771fe14910 *./data/a-mpeg2.mpg
+198404 ./data/a-mpeg2.mpg
+107af0aac7f32378988469bd6eae9c31 *./data/out.yuv
+stddev:  4.98 PSNR:34.17 bytes:7602176
+92962436161235f3cd2cede031eec94b *./data/a-mpeg2i.mpg
+205006 ./data/a-mpeg2i.mpg
+d215d0f3cbbfb687a929ccf2dd1a034a *./data/out.yuv
+stddev:  4.99 PSNR:34.16 bytes:7602176
+1a4cf7d54537d94ad9d042b06ac3da24 *./data/a-mpeg2thread.mpg
+177370 ./data/a-mpeg2thread.mpg
+0df3695c3379b0573bb1b50431170949 *./data/out.yuv
+stddev:  5.58 PSNR:33.18 bytes:7299072
+fe0779aa87f6e30c450944c807afb13a *./data/a-msmpeg4v2.avi
+129504 ./data/a-msmpeg4v2.avi
+25b5ba0b024fcd4028e707ffbeb80f55 *./data/out.yuv
+stddev:  5.33 PSNR:33.57 bytes:7602176
+a582969be47fc3ea84c42523b6a08ee9 *./data/a-msmpeg4.avi
+127110 ./data/a-msmpeg4.avi
+638e64258f26330f3cd36d8d2bbc73f5 *./data/out.yuv
+stddev:  5.33 PSNR:33.57 bytes:7602176
+29c763afd1986210e43e42d4a0f407a5 *./data/a-wmv1.avi
+128880 ./data/a-wmv1.avi
+f80d2809e79af3ebcfe831deab9af03c *./data/out.yuv
+stddev:  5.33 PSNR:33.58 bytes:7602176
+191d41c2bd34dc99367c43c466be313e *./data/a-wmv2.avi
+129214 ./data/a-wmv2.avi
+f80d2809e79af3ebcfe831deab9af03c *./data/out.yuv
+stddev:  5.33 PSNR:33.58 bytes:7602176
+ef053b1fec77a49eb8a27510b81e4041 *./data/a-h263.avi
+159596 ./data/a-h263.avi
+7ec66fb7dd4e5dddd3820c668d6636aa *./data/out.yuv
 stddev:  5.44 PSNR:33.41 bytes:7602176
-60ec057386c846f1f396daeca8709d88 *./data/a-msmpeg4.avi
- 130132 ./data/a-msmpeg4.avi
-a277f31a93c02ea241a5c4147d8c19cf *./data/out.yuv
-stddev:  5.44 PSNR:33.40 bytes:7602176
-7c8b38a496845c079ea95434937397d8 *./data/a-wmv1.avi
- 132256 ./data/a-wmv1.avi
-252d3435544372391ffb638e62957d34 *./data/out.yuv
-stddev:  5.43 PSNR:33.41 bytes:7602176
-c4d6c235f25468fff5cdaec370e435d1 *./data/a-wmv2.avi
- 132834 ./data/a-wmv2.avi
-252d3435544372391ffb638e62957d34 *./data/out.yuv
-stddev:  5.43 PSNR:33.41 bytes:7602176
-99a39e2f11d16cb88178f29d70f65eae *./data/a-h263.avi
- 161782 ./data/a-h263.avi
-dd1d762e16189ebc4e35edba973d409a *./data/out.yuv
-stddev:  5.52 PSNR:33.27 bytes:7602176
-b018228ed1c0a283e735d1a7d84c9b2e *./data/a-h263p.avi
- 869156 ./data/a-h263p.avi
-bdb990f96fa93ec84c69e45d5f7c539c *./data/out.yuv
-stddev:  1.91 PSNR:42.46 bytes:7602176
-a45700f7baffe36bec81a42b124e739e *./data/a-odivx.mp4
-124141 ./data/a-odivx.mp4
-c7d19f4c7905421ad8f21cde578342e0 *./data/out.yuv
-stddev:  5.44 PSNR:33.40 bytes:7602176
+0922e8721ebf48a8d7391285f79ecd78 *./data/a-h263p.avi
+868164 ./data/a-h263p.avi
+80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
+stddev:  1.91 PSNR:42.49 bytes:7602176
+e47f46468b79641e13bb9609be2db5ca *./data/a-odivx.mp4
+120196 ./data/a-odivx.mp4
+8b7657a7f9fc7298cc016abb466d1d19 *./data/out.yuv
+stddev:  5.34 PSNR:33.56 bytes:7602176
 242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi
 4987020 ./data/a-huffyuv.avi
 dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-55b7400e3abf9b24d4a0f5d2963ffa29 *./data/a-mpeg4-rc.avi
-223884 ./data/a-mpeg4-rc.avi
-5ad73d80df55d60384a43b8260174912 *./data/out.yuv
-stddev:  5.28 PSNR:33.66 bytes:7299072
-8249cc83e341cd18e45adf589e1d254e *./data/a-mpeg4-adv.avi
- 180988 ./data/a-mpeg4-adv.avi
-a46b891f446aef2c025dc2847dc86ed6 *./data/out.yuv
-stddev:  4.95 PSNR:34.22 bytes:7602176
-43411d9f33c8112a25d805f6edf88c17 *./data/a-mpeg4-thread.avi
-249622 ./data/a-mpeg4-thread.avi
-e01d0d5a98d2624b107e13c6f50c533c *./data/out.yuv
-stddev:  5.09 PSNR:33.97 bytes:7299072
-bfd6fcccc5aa8c3fa5222a33a0bb3b63 *./data/a-mpeg4-Q.avi
-159696 ./data/a-mpeg4-Q.avi
-f44b074a83b177950055ddd6da7e518d *./data/out.yuv
-stddev:  5.02 PSNR:34.09 bytes:7299072
-901ebdbc7438744f0832a9a0cc7678e3 *./data/a-error-mpeg4-adv.avi
- 194318 ./data/a-error-mpeg4-adv.avi
-f9ae5845930dda375afead55cfb8480b *./data/out.yuv
-stddev:  4.41 PSNR:35.23 bytes:7602176
-575cbd5319516c4741edeaf146d6481e *./data/a-mpeg4-nr.avi
- 158286 ./data/a-mpeg4-nr.avi
-c4c821da817173c6d225ae0432daa0a0 *./data/out.yuv
-stddev:  4.83 PSNR:34.43 bytes:7602176
-73bd6a2ef03f9b252b84062327424593 *./data/a-mpeg1b.mpg
- 220328 ./data/a-mpeg1b.mpg
-344788ad84775c9af184e0d0b4bad3ed *./data/out.yuv
-stddev:  5.98 PSNR:32.58 bytes:7145472
+f9d5a1e802400461b7186438399f0bb4 *./data/a-mpeg4-rc.avi
+225558 ./data/a-mpeg4-rc.avi
+3ca86bcd34c25ab2d1376f1df5d6f949 *./data/out.yuv
+stddev:  5.18 PSNR:33.83 bytes:7299072
+2a59d75495d025e5d0b9469e15b659ec *./data/a-mpeg4-adv.avi
+172538 ./data/a-mpeg4-adv.avi
+49fecc1105d25ff1c2fc9c0d4cb821b0 *./data/out.yuv
+stddev:  4.84 PSNR:34.41 bytes:7602176
+67b2b8a44968fd781ccb6d3e1eabec0b *./data/a-mpeg4-thread.avi
+249118 ./data/a-mpeg4-thread.avi
+7a7fefcea4c4147eb325c4b209c36143 *./data/out.yuv
+stddev:  5.00 PSNR:34.13 bytes:7299072
+2ecc22df666cbf8f188489c4e0136a19 *./data/a-mpeg4-Q.avi
+160760 ./data/a-mpeg4-Q.avi
+55620e8d62bc55cc994a63d4932c1b47 *./data/out.yuv
+stddev:  5.02 PSNR:34.10 bytes:7299072
+3f334fa234af979bd30142ac0986922d *./data/a-error-mpeg4-adv.avi
+175778 ./data/a-error-mpeg4-adv.avi
+62106b2ae4c1cfc985face2dadb90cbc *./data/out.yuv
+stddev: 10.05 PSNR:28.08 bytes:7602176
+0c9873e9bc6077f8ab01583ff900c715 *./data/a-mpeg4-nr.avi
+154392 ./data/a-mpeg4-nr.avi
+33a6f702049ef4e074c6266b9d17d3e9 *./data/out.yuv
+stddev:  4.73 PSNR:34.61 bytes:7602176
+843ea53e2731a9562959b685693679bd *./data/a-mpeg1b.mpg
+218567 ./data/a-mpeg1b.mpg
+001fa1424491dbb19e454db40e38908f *./data/out.yuv
+stddev:  5.94 PSNR:32.64 bytes:7145472
 e9218a1db885fe0262e88f9df630307d *./data/a-mjpeg.avi
- 635218 ./data/a-mjpeg.avi
+635218 ./data/a-mjpeg.avi
 a365b4da246ad68caf96b702b7f961a1 *./data/out.yuv
 stddev:  4.76 PSNR:34.56 bytes:7602176
 defd90b44bced2772c6ca0d8eb75f668 *./data/a-ljpeg.avi
 4764822 ./data/a-ljpeg.avi
 dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-53a73b773cf790c9379c875ffa73bce5 *./data/a-rv10.rm
- 157035 ./data/a-rv10.rm
-dd1d762e16189ebc4e35edba973d409a *./data/out.yuv
-stddev:  5.52 PSNR:33.27 bytes:7602176
+2123b30d786e6e6e25caf337f24e7834 *./data/a-rv10.rm
+154850 ./data/a-rv10.rm
+7ec66fb7dd4e5dddd3820c668d6636aa *./data/out.yuv
+stddev:  5.44 PSNR:33.41 bytes:7602176
 9c4f5a4613a5595c90c6b99bf143b6a9 *./data/a-asv1.avi
 1433376 ./data/a-asv1.avi
 4251d7f496bbf362251b065e840a1b73 *./data/out.yuv
@@ -99,10 +99,10 @@ stddev:  9.80 PSNR:28.29 bytes:7602176
 1263460 ./data/a-asv2.avi
 7d887519f7884e7c49c591831c11ac50 *./data/out.yuv
 stddev:  9.71 PSNR:28.37 bytes:7602176
-7e38c789c9913bcf863d4db724091b70 *./data/a-flv.flv
- 134955 ./data/a-flv.flv
-4ecc1c26b20de789e8ef59c649c2534e *./data/out.yuv
-stddev:  5.44 PSNR:33.41 bytes:7602176
+d847c144e7b72027531047ea4c441cbf *./data/a-flv.flv
+131771 ./data/a-flv.flv
+e61cd1e7c5a292d396ae90f4d2fb3db7 *./data/out.yuv
+stddev:  5.33 PSNR:33.57 bytes:7602176
 0db09835ebc3d22f166f30879f3ccc38 *./data/a-ffv1.avi
 3524824 ./data/a-ffv1.avi
 dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv