[MPlayer-users] [PATCH] lavc psnr mixup

[Loren Merritt]

On Wed, 8 Sep 2004, Michael Niedermayer wrote:
> On Wednesday 08 September 2004 00:48, Loren Merritt wrote:
>
>> The PSNR values in the psnr_*.log generated by mencoder/lavc seem to be
>> matched up to the wrong frame numbers. This occurs consistently on all
>> input videos and all lavcopts, including different vcodec's.
>> The offset is (3 + vmax_b_frames), and happens in display order, even
>> though stats are output in encoded order.
>> The other stats (qp, size, frame type) are matched to the correct
>> frame number.
>> The PSNRs that get bumped off the end due to this offset are not used
>> when calculating the PSNR summary printed by mencoder, but the "inf"s
>> inserted at the beginning are also not counted in that summary.
>
> should be fixed

The PSNRs are fixed, but the frame type is now wrong:
I-frames due to scenechange detection are reported as P.

--Loren Merritt
-------------- next part --------------
Index: libavcodec/mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.426
diff -u -r1.426 mpegvideo.c
--- libavcodec/mpegvideo.c	8 Sep 2004 10:07:08 -0000	1.426
+++ libavcodec/mpegvideo.c	10 Sep 2004 22:40:30 -0000
@@ -4842,7 +4842,9 @@
     }
     
     //FIXME var duplication
+    s->current_picture_ptr->key_frame=
     s->current_picture.key_frame= s->pict_type == I_TYPE; //FIXME pic_ptr
+    s->current_picture_ptr->pict_type=
     s->current_picture.pict_type= s->pict_type;
 
     if(s->current_picture.key_frame)