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

codecs: Integrate H265 DPB full check into need_bump().

Browse source 
The current DPB check of H265 is not very correct. The current frame
is already in the DPB when we check whether the DPB is full.
For example, the DPB max size is 16 and we have 15 ref frames in the
DPB, so the gst_h265_dpb_delete_unused() cleans no one, and then plus
the current frame, the DPB is 16. This causes an error return, but in
fact, the stream is correct.
We now integrate the DPB full check into the need_bump() function.
We add the correct frame into to DPB and then check whether the picture
num is bigger than max_num_pics of DPB(which means there is no room for
the current picture). If true, we bump the DPB immediately.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2291>
This commit is contained in:
He Junyan 2021-05-31 17:51:58 +08:00 committed by GStreamer Marge Bot
parent cbe89db444
commit c442c9bd5e
3 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst-libs/gst/codecs/gsth265decoder.c
View file

@ -1628,13 +1628,6 @@ gst_h265_decoder_finish_picture (GstH265Decoder * self,
gst_h265_decoder_do_output_picture (self, to_output); gst_h265_decoder_do_output_picture (self, to_output);
} }
if (gst_h265_dpb_is_full (priv->dpb)) {
/* If we haven't managed to output anything to free up space in DPB
* to store this picture, it's an error in the stream */
GST_WARNING_OBJECT (self, "Could not free up space in DPB");
return FALSE;
}
return TRUE; return TRUE;
} }

24
gst-libs/gst/codecs/gsth265picture.c
View file

@ -450,20 +450,6 @@ gst_h265_dpb_get_size (GstH265Dpb * dpb)
return dpb->pic_list->len; return dpb->pic_list->len;
} }
/**
* gst_h265_dpb_is_full:
* @dpb: a #GstH265Dpb
*
* Return: %TRUE if @dpb is full
*/
gboolean
gst_h265_dpb_is_full (GstH265Dpb * dpb)
{
g_return_val_if_fail (dpb != NULL, -1);
return dpb->pic_list->len >= dpb->max_num_pics;
}
/** /**
* gst_h265_dpb_get_picture: * gst_h265_dpb_get_picture:
* @dpb: a #GstH265Dpb * @dpb: a #GstH265Dpb
@ -533,6 +519,16 @@ gst_h265_dpb_needs_bump (GstH265Dpb * dpb, guint max_num_reorder_pics,
g_return_val_if_fail (dpb != NULL, FALSE); g_return_val_if_fail (dpb != NULL, FALSE);
g_assert (dpb->num_output_needed >= 0); g_assert (dpb->num_output_needed >= 0);
/* If DPB is full and there is no empty space to store current picture,
* need bumping.
* NOTE: current picture was added already by our decoding flow, so we
* need to do bumping until dpb->pic_list->len == dpb->max_num_pic
*/
if (dpb->pic_list->len > dpb->max_num_pics) {
GST_TRACE ("No empty frame buffer, need bumping");
return TRUE;
}
/* C.5.2.3 */ /* C.5.2.3 */
if (dpb->num_output_needed > max_num_reorder_pics) { if (dpb->num_output_needed > max_num_reorder_pics) {
GST_TRACE ("num_output_needed (%d) > max_num_reorder_pics (%d)", GST_TRACE ("num_output_needed (%d) > max_num_reorder_pics (%d)",

3
gst-libs/gst/codecs/gsth265picture.h
View file

@ -191,9 +191,6 @@ GstH265Picture * gst_h265_dpb_get_picture (GstH265Dpb * dpb,
GST_CODECS_API GST_CODECS_API
gint gst_h265_dpb_get_size (GstH265Dpb * dpb); gint gst_h265_dpb_get_size (GstH265Dpb * dpb);
GST_CODECS_API
gboolean gst_h265_dpb_is_full (GstH265Dpb * dpb);
GST_CODECS_API GST_CODECS_API
gboolean gst_h265_dpb_needs_bump (GstH265Dpb * dpb, gboolean gst_h265_dpb_needs_bump (GstH265Dpb * dpb,
guint max_num_reorder_pics, guint max_num_reorder_pics,