mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-26 07:56:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: decoder: h264/h265: decode codec data only if opened

Browse source 
Fixes regression introduced by commit 2eb2b26a.

There is a use case when the decoder set the src caps and immediatly
tries to process the media codec_data, this happens before decoder is
even opened, thus priv->parser is not instantiated yet.

https://bugzilla.gnome.org/show_bug.cgi?id=787818
This commit is contained in:
Hyunjun Ko 2017-09-18 14:29:55 +09:00 committed by Víctor Manuel Jáquez Leal
parent e308b452d6
commit b107520587
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -4381,6 +4381,9 @@ gst_vaapi_decoder_h264_decode_codec_data (GstVaapiDecoder * base_decoder,
GstH264ParserResult result; GstH264ParserResult result;
guint i, ofs, num_sps, num_pps; guint i, ofs, num_sps, num_pps;
if (!priv->is_opened)
return GST_VAAPI_DECODER_STATUS_SUCCESS;
unit.parsed_info = NULL; unit.parsed_info = NULL;
if (buf_size < 7) if (buf_size < 7)

3
gst-libs/gst/vaapi/gstvaapidecoder_h265.c
View file

@ -2653,6 +2653,9 @@ gst_vaapi_decoder_h265_decode_codec_data (GstVaapiDecoder *
guint num_nal_arrays, num_nals; guint num_nal_arrays, num_nals;
guint i, j, ofs; guint i, j, ofs;
if (!priv->is_opened)
return GST_VAAPI_DECODER_STATUS_SUCCESS;
unit.parsed_info = NULL; unit.parsed_info = NULL;
if (buf_size < 23) if (buf_size < 23)
return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA; return GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;