vah264dec: Allow missing reference picture
authorSeungha Yang <seungha@centricular.com>
Fri, 13 Nov 2020 18:20:19 +0000 (03:20 +0900)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Sat, 14 Nov 2020 16:17:18 +0000 (16:17 +0000)
baseclass might provide reference picture list with null picture.
Ensure picture before filling picture information.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1809>

sys/va/gstvah264dec.c

index e90f84b..184af43 100644 (file)
@@ -198,7 +198,13 @@ _fill_ref_pic_list (VAPictureH264 va_reflist[32], GArray * reflist)
 
   for (i = 0; i < reflist->len; i++) {
     GstH264Picture *picture = g_array_index (reflist, GstH264Picture *, i);
-    _fill_vaapi_pic (&va_reflist[i], picture);
+
+    if (picture) {
+      _fill_vaapi_pic (&va_reflist[i], picture);
+    } else {
+      /* list might include null picture if reference picture was missing */
+      _init_vaapi_pic (&va_reflist[i]);
+    }
   }
 
   for (; i < 32; i++)