dxva-h264 Fix dxva playback of streams that don't start with an I-Frame.

fritsch · Sep 5, 2015 · 7a04090 · 7a04090
1 parent 4b8ca3b
commit 7a04090
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
@@ -497,6 +497,14 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx)
 
     if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
         return -1;
+
+    // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs
+    if (!h->got_first_iframe) {
+        if (!(ctx_pic->pp.wBitFields & (1 << 15)))
+            return -1;
+        h->got_first_iframe = 1;
+    }
+
     ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr->f,
                                     &ctx_pic->pp, sizeof(ctx_pic->pp),
                                     &ctx_pic->qm, sizeof(ctx_pic->qm),

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
@@ -1107,6 +1107,7 @@ void ff_h264_flush_change(H264Context *h)
     h->mmco_reset = 1;
     for (i = 0; i < h->nb_slice_ctx; i++)
         h->slice_ctx[i].list_count = 0;
+    h->got_first_iframe = 0;
 }
 
 /* forget old pics after a seek */

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
@@ -813,6 +813,8 @@ typedef struct H264Context {
      * slices) anymore */
     int setup_finished;
 
+    int got_first_iframe;
+
     // Timestamp stuff
     int sei_buffering_period_present;   ///< Buffering period SEI flag
     int initial_cpb_removal_delay[32];  ///< Initial timestamps for CPBs

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
@@ -1043,6 +1043,7 @@ static int h264_slice_header_init(H264Context *h)
 
     h->first_field           = 0;
     h->prev_interlaced_frame = 1;
+    h->got_first_iframe = 0;
 
     init_scan_tables(h);
     ret = ff_h264_alloc_tables(h);