mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

h265decoder: Improve robustness against malformed NAL packets

Browse source 
Use newly added gst_h265_parser_identify_and_split_nalu_hevc()
method to handle broken streams where packetized NAL unit
contain start code prefix in it.

It's obviously wrong stream but we know how to work around it
and even need to support such broken streams since
stateless decoder implementations are being a primary
decoder element.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2394>
This commit is contained in:
Seungha Yang 2022-05-07 03:15:44 +09:00
parent be84fc23ca
commit 8d40531f23
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
subprojects/gst-plugins-bad/gst-libs/gst/codecs/gsth265decoder.c
View file

@ -127,6 +127,9 @@ struct _GstH265DecoderPrivate
GArray *nalu;
/* Split packetized data into actual nal chunks (for malformed stream) */
GArray *split_nalu;
/* For delayed output */
guint preferred_output_delay;
gboolean is_live;
@ -224,6 +227,7 @@ gst_h265_decoder_init (GstH265Decoder * self)
sizeof (GstH265Picture *), 32);
priv->nalu = g_array_sized_new (FALSE, TRUE, sizeof (GstH265DecoderNalUnit),
8);
priv->split_nalu = g_array_new (FALSE, FALSE, sizeof (GstH265NalUnit));
g_array_set_clear_func (priv->nalu,
(GDestroyNotify) gst_h265_decoder_clear_nalu);
priv->output_queue =
@ -242,6 +246,7 @@ gst_h265_decoder_finalize (GObject * object)
g_array_unref (priv->ref_pic_list0);
g_array_unref (priv->ref_pic_list1);
g_array_unref (priv->nalu);
g_array_unref (priv->split_nalu);
gst_queue_array_free (priv->output_queue);
G_OBJECT_CLASS (parent_class)->finalize (object);
@ -1852,18 +1857,29 @@ gst_h265_decoder_handle_frame (GstVideoDecoder * decoder,
if (priv->in_format == GST_H265_DECODER_FORMAT_HVC1 ||
priv->in_format == GST_H265_DECODER_FORMAT_HEV1) {
pres = gst_h265_parser_identify_nalu_hevc (priv->parser,
map.data, 0, map.size, priv->nal_length_size, &nalu);
guint offset = 0;
gsize consumed;
while (pres == GST_H265_PARSER_OK) {
pres = gst_h265_decoder_parse_nalu (self, &nalu);
do {
pres = gst_h265_parser_identify_and_split_nalu_hevc (priv->parser,
map.data, offset, map.size, priv->nal_length_size, priv->split_nalu,
&consumed);
if (pres != GST_H265_PARSER_OK)
break;
pres = gst_h265_parser_identify_nalu_hevc (priv->parser,
map.data, nalu.offset + nalu.size, map.size, priv->nal_length_size,
&nalu);
}
for (i = 0; i < priv->split_nalu->len; i++) {
GstH265NalUnit *nl =
&g_array_index (priv->split_nalu, GstH265NalUnit, i);
pres = gst_h265_decoder_parse_nalu (self, nl);
if (pres != GST_H265_PARSER_OK)
break;
}
if (pres != GST_H265_PARSER_OK)
break;
offset += consumed;
} while (pres == GST_H265_PARSER_OK);
} else {
pres = gst_h265_parser_identify_nalu (priv->parser,
map.data, 0, map.size, &nalu);