[SCM] libav/experimental: Set VDPAU H264 picture parameter field_order_cnt and frame_num at the start of decoding a picture instead of at the end. Fixes mmco01.264

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3bccd93ac0b7e5dbb4a335257eaee9d8908dad3c
Author: Stephen Warren <>
Date:   Tue Mar 30 08:10:29 2010 +0000

    Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
    start of decoding a picture instead of at the end.
    Fixes mmco01.264
    
    Patch by Stephen Warren
    
    Originally committed as revision 22728 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 44f8783..55a8177 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2577,9 +2577,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
             avctx->profile = hx->sps.profile_idc;
             avctx->level   = hx->sps.level_idc;
 
-            if (s->avctx->hwaccel && h->current_slice == 1) {
-                if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
+            if (h->current_slice == 1) {
+                if (s->avctx->hwaccel && s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
                     return -1;
+                if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+                    ff_vdpau_h264_picture_start(s);
             }
 
             s->current_picture_ptr->key_frame |=
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 1ee935b..bd721e8 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -127,7 +127,7 @@ void ff_vdpau_add_data_chunk(MpegEncContext *s,
     render->bitstream_buffers_used++;
 }
 
-void ff_vdpau_h264_picture_complete(MpegEncContext *s)
+void ff_vdpau_h264_picture_start(MpegEncContext *s)
 {
     H264Context *h = s->avctx->priv_data;
     struct vdpau_render_state *render;
@@ -136,10 +136,6 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
     render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
     assert(render);
 
-    render->info.h264.slice_count = h->slice_num;
-    if (render->info.h264.slice_count < 1)
-        return;
-
     for (i = 0; i < 2; ++i) {
         int foc = s->current_picture_ptr->field_poc[i];
         if (foc == INT_MAX)
@@ -147,8 +143,22 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
         render->info.h264.field_order_cnt[i] = foc;
     }
 
+    render->info.h264.frame_num = h->frame_num;
+}
+
+void ff_vdpau_h264_picture_complete(MpegEncContext *s)
+{
+    H264Context *h = s->avctx->priv_data;
+    struct vdpau_render_state *render;
+
+    render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
+    assert(render);
+
+    render->info.h264.slice_count = h->slice_num;
+    if (render->info.h264.slice_count < 1)
+        return;
+
     render->info.h264.is_reference                           = (s->current_picture_ptr->reference & 3) ? VDP_TRUE : VDP_FALSE;
-    render->info.h264.frame_num                              = h->frame_num;
     render->info.h264.field_pic_flag                         = s->picture_structure != PICT_FRAME;
     render->info.h264.bottom_field_flag                      = s->picture_structure == PICT_BOTTOM_FIELD;
     render->info.h264.num_ref_frames                         = h->sps.ref_frame_count;
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index ce8a426..0a8d0b6 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -33,6 +33,7 @@ void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
 void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
                                     int buf_size, int slice_count);
 
+void ff_vdpau_h264_picture_start(MpegEncContext *s);
 void ff_vdpau_h264_set_reference_frames(MpegEncContext *s);
 void ff_vdpau_h264_picture_complete(MpegEncContext *s);
 

-- 
Libav/FFmpeg packaging