[xine-cvs] HG: xine-lib-1.2: VDPAU VC1: fixes field interlace refframes + skipped frames.

[Christophe T. <hf...@fr...>]

# HG changeset patch
# User Christophe Thommeret <hf...@fr...>
# Date 1271491118 -7200
# Node ID c7c994fd37a48ac883aace1104b5832252937cf3
# Parent  cb99a1abe986c55e7926407eac9773df69abf140
VDPAU VC1: fixes field interlace refframes + skipped frames.

diff --git a/src/video_dec/libvdpau/vdpau_vc1.c b/src/video_dec/libvdpau/vdpau_vc1.c
--- a/src/video_dec/libvdpau/vdpau_vc1.c
+++ b/src/video_dec/libvdpau/vdpau_vc1.c
@@ -624,20 +624,6 @@
 
 
 
-static void duplicate_image( vdpau_vc1_decoder_t *vd, vo_frame_t *dst )
-{
-  lprintf("duplicate_image\n");
-  sequence_t *seq = (sequence_t*)&vd->sequence;
-  picture_t *pic = (picture_t*)&seq->picture;
-
-  if ( !seq->backward_ref ) /* Should not happen! */
-    return;
-
-  dst->proc_duplicate_frame_data( dst, seq->backward_ref );
-}
-
-
-
 static void decode_render( vdpau_vc1_decoder_t *vd, vdpau_accel_t *accel, uint8_t *buf, int len )
 {
   sequence_t *seq = (sequence_t*)&vd->sequence;
@@ -690,9 +676,14 @@
         pic->vdp_infos.forward_reference = VDP_INVALID_HANDLE;
         break;
       case FIELDS_I_P:
+        pic->vdp_infos.forward_reference = accel->surface;
+        pic->vdp_infos.picture_type = P_FRAME;
+        break;
       case FIELDS_P_P:
-        pic->vdp_infos.forward_reference = accel->surface;
-        pic->vdp_infos.picture_type = P_FRAME; break;
+        if ( seq->backward_ref )
+          pic->vdp_infos.forward_reference = ((vdpau_accel_t*)seq->backward_ref->accel_data)->surface;
+        pic->vdp_infos.picture_type = P_FRAME;
+        break;
       case FIELDS_B_B:
       case FIELDS_BI_B:
         pic->vdp_infos.picture_type = B_FRAME;
@@ -777,6 +768,9 @@
     if ( len < 2 )
       pic->skipped = 1;
   }
+
+  if ( pic->skipped )
+    pic->vdp_infos.picture_type = P_FRAME;
 
   if ( pic->vdp_infos.interlace && pic->vdp_infos.frame_coding_mode == PICTURE_FIELD_INTERLACE ) {
     if ( !(field = search_field( vd, buf, len )) )
@@ -834,10 +828,7 @@
     vd->decoder = VDP_INVALID_HANDLE;
   }
 
-  if ( pic->skipped )
-    duplicate_image( vd, img );
-  else
-    decode_render( vd, accel, buf, len );
+  decode_render( vd, accel, buf, len );
 
 
 #ifdef MAKE_DAT