From fac59d6fcfed35ea0ff400ec33d0001172057c06 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Sat, 26 Apr 2014 20:21:46 +0200
Subject: [PATCH] decoder: h264: fix initialization of RefPicLists for multiple
 slices.

The initialization of reference picture lists (8.2.4.2) applies to all
slices. So, the RefPicList0/1 lists need to be constructed prior to
each slice submission to the HW decoder.

This fixes decoding of video sequences where frames are encoded with
multiple slices of different types, e.g. 4 slices in this order I, P,
I, and P. More precisely, CABAST3_Sony_E and CABASTBR3_Sony_B.

https://bugzilla.gnome.org/show_bug.cgi?id=724518
---
 gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 39 ++++++-----------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index c238061380..d392a42659 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -2033,7 +2033,6 @@ init_picture_refs(
 )
 {
     GstVaapiDecoderH264Private * const priv = &decoder->priv;
-    GstVaapiPicture * const base_picture = &picture->base;
     guint i, num_refs;
 
     init_picture_ref_lists(decoder);
@@ -2042,12 +2041,12 @@ init_picture_refs(
     priv->RefPicList0_count = 0;
     priv->RefPicList1_count = 0;
 
-    switch (base_picture->type) {
-    case GST_VAAPI_PICTURE_TYPE_P:
-    case GST_VAAPI_PICTURE_TYPE_SP:
+    switch (slice_hdr->type % 5) {
+    case GST_H264_P_SLICE:
+    case GST_H264_SP_SLICE:
         init_picture_refs_p_slice(decoder, picture, slice_hdr);
         break;
-    case GST_VAAPI_PICTURE_TYPE_B:
+    case GST_H264_B_SLICE:
         init_picture_refs_b_slice(decoder, picture, slice_hdr);
         break;
     default:
@@ -2056,16 +2055,16 @@ init_picture_refs(
 
     exec_picture_refs_modification(decoder, picture, slice_hdr);
 
-    switch (base_picture->type) {
-    case GST_VAAPI_PICTURE_TYPE_B:
+    switch (slice_hdr->type % 5) {
+    case GST_H264_B_SLICE:
         num_refs = 1 + slice_hdr->num_ref_idx_l1_active_minus1;
         for (i = priv->RefPicList1_count; i < num_refs; i++)
             priv->RefPicList1[i] = NULL;
         priv->RefPicList1_count = num_refs;
 
         // fall-through
-    case GST_VAAPI_PICTURE_TYPE_P:
-    case GST_VAAPI_PICTURE_TYPE_SP:
+    case GST_H264_P_SLICE:
+    case GST_H264_SP_SLICE:
         num_refs = 1 + slice_hdr->num_ref_idx_l0_active_minus1;
         for (i = priv->RefPicList0_count; i < num_refs; i++)
             priv->RefPicList0[i] = NULL;
@@ -2091,6 +2090,7 @@ init_picture(
     picture->frame_num_wrap     = priv->frame_num;
     picture->output_flag        = TRUE; /* XXX: conformant to Annex A only */
     base_picture->pts           = GST_VAAPI_DECODER_CODEC_FRAME(decoder)->pts;
+    base_picture->type          = GST_VAAPI_PICTURE_TYPE_NONE;
 
     /* Reset decoder state for IDR pictures */
     if (pi->nalu.type == GST_H264_NAL_SLICE_IDR) {
@@ -2099,25 +2099,6 @@ init_picture(
         dpb_flush(decoder);
     }
 
-    /* Initialize slice type */
-    switch (slice_hdr->type % 5) {
-    case GST_H264_P_SLICE:
-        base_picture->type = GST_VAAPI_PICTURE_TYPE_P;
-        break;
-    case GST_H264_B_SLICE:
-        base_picture->type = GST_VAAPI_PICTURE_TYPE_B;
-        break;
-    case GST_H264_I_SLICE:
-        base_picture->type = GST_VAAPI_PICTURE_TYPE_I;
-        break;
-    case GST_H264_SP_SLICE:
-        base_picture->type = GST_VAAPI_PICTURE_TYPE_SP;
-        break;
-    case GST_H264_SI_SLICE:
-        base_picture->type = GST_VAAPI_PICTURE_TYPE_SI;
-        break;
-    }
-
     /* Initialize picture structure */
     if (!slice_hdr->field_pic_flag)
         base_picture->structure = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
@@ -2145,7 +2126,6 @@ init_picture(
     }
 
     init_picture_poc(decoder, picture, slice_hdr);
-    init_picture_refs(decoder, picture, slice_hdr);
     return TRUE;
 }
 
@@ -2860,6 +2840,7 @@ decode_slice(GstVaapiDecoderH264 *decoder, GstVaapiDecoderUnit *unit)
         return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
     }
 
+    init_picture_refs(decoder, picture, slice_hdr);
     if (!fill_slice(decoder, slice, pi)) {
         gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(slice));
         return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;