mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah264dec: Fix for long term reference picture signalling

Browse source 
Allocate a GArray which is used to fill
VAPictureParameterBufferH264.ReferenceFrames (called per frame),
instead of alloc/free per frame.
Also this commit is to fix the condition where long-term reference
picture is needed for VAPictureParameterBufferH264.ReferenceFrames
entry.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1813>
This commit is contained in:
Seungha Yang 2020-11-16 04:38:28 +09:00 committed by GStreamer Merge Bot
parent fec686145e
commit d3d2af6c84
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
sys/va/gstvah264dec.c
View file

@ -82,6 +82,9 @@ struct _GstVaH264Dec
gint coded_height; gint coded_height;
gint dpb_size; gint dpb_size;
/* Used to fill VAPictureParameterBufferH264.ReferenceFrames */
GArray *ref_list;
gboolean need_negotiation; gboolean need_negotiation;
}; };
@ -347,6 +350,7 @@ static gboolean
gst_va_h264_dec_start_picture (GstH264Decoder * decoder, gst_va_h264_dec_start_picture (GstH264Decoder * decoder,
GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb) GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
{ {
GstVaH264Dec *self = GST_VA_H264_DEC (decoder);
GstH264PPS *pps; GstH264PPS *pps;
GstH264SPS *sps; GstH264SPS *sps;
GstVaBaseDec *base = GST_VA_BASE_DEC (decoder); GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
@ -354,6 +358,7 @@ gst_va_h264_dec_start_picture (GstH264Decoder * decoder,
VAIQMatrixBufferH264 iq_matrix = { 0, }; VAIQMatrixBufferH264 iq_matrix = { 0, };
VAPictureParameterBufferH264 pic_param; VAPictureParameterBufferH264 pic_param;
guint i, n; guint i, n;
GArray *ref_list = self->ref_list;
va_pic = gst_h264_picture_get_user_data (picture); va_pic = gst_h264_picture_get_user_data (picture);
@ -409,26 +414,25 @@ gst_va_h264_dec_start_picture (GstH264Decoder * decoder,
/* reference frames */ /* reference frames */
{ {
GArray *ref_list = g_array_sized_new (FALSE, FALSE, guint ref_frame_idx = 0;
sizeof (GstH264Picture *), 16); g_array_set_size (ref_list, 0);
g_array_set_clear_func (ref_list, (GDestroyNotify) gst_h264_picture_clear);
gst_h264_dpb_get_pictures_short_term_ref (dpb, ref_list); gst_h264_dpb_get_pictures_short_term_ref (dpb, ref_list);
for (i = 0; i < 16 && i < ref_list->len; i++) { for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
GstH264Picture *pic = g_array_index (ref_list, GstH264Picture *, i); GstH264Picture *pic = g_array_index (ref_list, GstH264Picture *, i);
_fill_vaapi_pic (&pic_param.ReferenceFrames[i], pic); _fill_vaapi_pic (&pic_param.ReferenceFrames[ref_frame_idx++], pic);
} }
g_array_set_size (ref_list, 0); g_array_set_size (ref_list, 0);
gst_h264_dpb_get_pictures_long_term_ref (dpb, ref_list); gst_h264_dpb_get_pictures_long_term_ref (dpb, ref_list);
for (; i < 16 && i < ref_list->len; i++) { for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
GstH264Picture *pic = g_array_index (ref_list, GstH264Picture *, i); GstH264Picture *pic = g_array_index (ref_list, GstH264Picture *, i);
_fill_vaapi_pic (&pic_param.ReferenceFrames[i], pic); _fill_vaapi_pic (&pic_param.ReferenceFrames[ref_frame_idx++], pic);
} }
g_array_unref (ref_list); g_array_set_size (ref_list, 0);
for (; i < 16; i++) for (; ref_frame_idx < 16; ref_frame_idx++)
_init_vaapi_pic (&pic_param.ReferenceFrames[i]); _init_vaapi_pic (&pic_param.ReferenceFrames[ref_frame_idx]);
} }
if (!gst_va_decoder_add_param_buffer (base->decoder, va_pic, if (!gst_va_decoder_add_param_buffer (base->decoder, va_pic,
@ -781,7 +785,11 @@ gst_va_h264_dec_negotiate (GstVideoDecoder * decoder)
static void static void
gst_va_h264_dec_dispose (GObject * object) gst_va_h264_dec_dispose (GObject * object)
{ {
GstVaH264Dec *self = GST_VA_H264_DEC (object);
gst_va_base_dec_close (GST_VIDEO_DECODER (object)); gst_va_base_dec_close (GST_VIDEO_DECODER (object));
g_clear_pointer (&self->ref_list, g_array_unref);
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
} }
@ -845,9 +853,16 @@ gst_va_h264_dec_class_init (gpointer g_class, gpointer class_data)
static void static void
gst_va_h264_dec_init (GTypeInstance * instance, gpointer g_class) gst_va_h264_dec_init (GTypeInstance * instance, gpointer g_class)
{ {
GstVaH264Dec *self = GST_VA_H264_DEC (instance);
gst_va_base_dec_init (GST_VA_BASE_DEC (instance), GST_CAT_DEFAULT); gst_va_base_dec_init (GST_VA_BASE_DEC (instance), GST_CAT_DEFAULT);
gst_h264_decoder_set_process_ref_pic_lists (GST_H264_DECODER (instance), gst_h264_decoder_set_process_ref_pic_lists (GST_H264_DECODER (instance),
TRUE); TRUE);
self->ref_list = g_array_sized_new (FALSE, TRUE,
sizeof (GstH264Picture *), 16);
g_array_set_clear_func (self->ref_list,
(GDestroyNotify) gst_h264_picture_clear);
} }
static gpointer static gpointer