mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: encoder: H264: Fix one assert in get_pending_reordered().

Browse source 
gst_vaapi_encoder_h264_get_pending_reordered() does not consider the
case for HIERARCHICAL_B mode. The pipeline:

gst-launch-1.0  videotestsrc num-buffers=48 ! vaapih264enc prediction-type=2 \
keyframe-period=32 ! fakesink

get a assert:

ERROR:../gst-libs/gst/vaapi/gstvaapiencoder_h264.c:1996:reflist1_init_hierarchical_b:
assertion failed: (count != 0)

The last few B frames are not fetched in correct order when HIERARCHICAL_B
is enabled.

We also fix a latent bug for normal mode. The g_queue_pop_tail() of B frames
make the last several frames encoded in reverse order. The NAL of last few
frames come in reverse order in the bit stream, though it can still output
the correct image.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/405>
This commit is contained in:
He Junyan 2020-12-09 00:04:33 +08:00
parent dfc730165c
commit 5997093ba1
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

@ -2943,6 +2943,23 @@ error:
} }
} }
/* reorder_list sorting for hierarchical-b encode */
static gint
sort_hierarchical_b (gconstpointer a, gconstpointer b, gpointer user_data)
{
GstVaapiEncPicture *pic1 = (GstVaapiEncPicture *) a;
GstVaapiEncPicture *pic2 = (GstVaapiEncPicture *) b;
if (pic1->type != GST_VAAPI_PICTURE_TYPE_B)
return 1;
if (pic2->type != GST_VAAPI_PICTURE_TYPE_B)
return -1;
if (pic1->temporal_id == pic2->temporal_id)
return pic1->poc - pic2->poc;
else
return pic1->temporal_id - pic2->temporal_id;
}
struct _PendingIterState struct _PendingIterState
{ {
guint cur_view; guint cur_view;
@ -2955,7 +2972,7 @@ gst_vaapi_encoder_h264_get_pending_reordered (GstVaapiEncoder * base_encoder,
{ {
GstVaapiEncoderH264 *const encoder = GST_VAAPI_ENCODER_H264 (base_encoder); GstVaapiEncoderH264 *const encoder = GST_VAAPI_ENCODER_H264 (base_encoder);
GstVaapiH264ViewReorderPool *reorder_pool; GstVaapiH264ViewReorderPool *reorder_pool;
GstVaapiEncPicture *pic; GstVaapiEncPicture *pic = NULL;
struct _PendingIterState *iter; struct _PendingIterState *iter;
g_return_val_if_fail (state, FALSE); g_return_val_if_fail (state, FALSE);
@ -2979,13 +2996,28 @@ gst_vaapi_encoder_h264_get_pending_reordered (GstVaapiEncoder * base_encoder,
return TRUE; /* perhaps other views has pictures? */ return TRUE; /* perhaps other views has pictures? */
} }
if (iter->pic_type == GST_VAAPI_PICTURE_TYPE_P) {
pic = g_queue_pop_tail (&reorder_pool->reorder_frame_list); pic = g_queue_pop_tail (&reorder_pool->reorder_frame_list);
g_assert (pic); g_assert (pic);
if (iter->pic_type == GST_VAAPI_PICTURE_TYPE_P) {
set_p_frame (pic, encoder); set_p_frame (pic, encoder);
g_queue_foreach (&reorder_pool->reorder_frame_list, (GFunc) set_b_frame,
encoder);
/* sort the queued list of frames for hierarchical-b based on
* temporal level where each frame belongs */
if (encoder->prediction_type ==
GST_VAAPI_ENCODER_H264_PREDICTION_HIERARCHICAL_B) {
pic->temporal_id = 0;
GST_VAAPI_PICTURE_FLAG_SET (pic, GST_VAAPI_ENC_PICTURE_FLAG_REFERENCE);
g_queue_sort (&reorder_pool->reorder_frame_list, sort_hierarchical_b,
NULL);
}
iter->pic_type = GST_VAAPI_PICTURE_TYPE_B; iter->pic_type = GST_VAAPI_PICTURE_TYPE_B;
} else if (iter->pic_type == GST_VAAPI_PICTURE_TYPE_B) { } else if (iter->pic_type == GST_VAAPI_PICTURE_TYPE_B) {
set_b_frame (pic, encoder); pic = g_queue_pop_head (&reorder_pool->reorder_frame_list);
g_assert (pic);
} else { } else {
GST_WARNING ("Unhandled pending picture type"); GST_WARNING ("Unhandled pending picture type");
} }
@ -3141,23 +3173,6 @@ get_temporal_id (GstVaapiEncoderH264 * encoder, guint32 display_order)
return 0; return 0;
} }
/* reorder_list sorting for hierarchical-b encode */
static gint
sort_hierarchical_b (gconstpointer a, gconstpointer b, gpointer user_data)
{
GstVaapiEncPicture *pic1 = (GstVaapiEncPicture *) a;
GstVaapiEncPicture *pic2 = (GstVaapiEncPicture *) b;
if (pic1->type != GST_VAAPI_PICTURE_TYPE_B)
return 1;
if (pic2->type != GST_VAAPI_PICTURE_TYPE_B)
return -1;
if (pic1->temporal_id == pic2->temporal_id)
return pic1->poc - pic2->poc;
else
return pic1->temporal_id - pic2->temporal_id;
}
static GstVaapiEncoderStatus static GstVaapiEncoderStatus
gst_vaapi_encoder_h264_reordering (GstVaapiEncoder * base_encoder, gst_vaapi_encoder_h264_reordering (GstVaapiEncoder * base_encoder,
GstVideoCodecFrame * frame, GstVaapiEncPicture ** output) GstVideoCodecFrame * frame, GstVaapiEncPicture ** output)