mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecs: h265: Make sure that sps is processed just before decoding

Browse source 
It may happens that bitstream doesn't provided SPS in decoding order
(like in VPSSPSPPS_A_MainConcept_1 conformance test file).
To be sure that the decoder got the correct SPS parameters process
SPS just before start decoding the frame.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
This commit is contained in:
Benjamin Gaignard 2022-06-08 15:44:26 +02:00 committed by Nicolas Dufresne
parent 5019be9fdb
commit 8ec0dca73b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -757,6 +757,15 @@ gst_h265_decoder_process_slice (GstH265Decoder * self, GstH265Slice * slice)
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; return ret;
/* The used SPS may not be the latest parsed one, make
* sure we have updated it before decode the frame */
ret = gst_h265_decoder_process_sps (self,
priv->current_slice.header.pps->sps);
if (ret != GST_FLOW_OK) {
GST_WARNING_OBJECT (self, "Failed to process sps");
return ret;
}
priv->active_pps = priv->current_slice.header.pps; priv->active_pps = priv->current_slice.header.pps;
priv->active_sps = priv->active_pps->sps; priv->active_sps = priv->active_pps->sps;
@ -932,10 +941,10 @@ static GstFlowReturn
gst_h265_decoder_decode_nalu (GstH265Decoder * self, gst_h265_decoder_decode_nalu (GstH265Decoder * self,
GstH265DecoderNalUnit * nalu) GstH265DecoderNalUnit * nalu)
{ {
if (!nalu->is_slice) if (nalu->is_slice)
return gst_h265_decoder_process_sps (self, &nalu->unit.sps); return gst_h265_decoder_process_slice (self, &nalu->unit.slice);
return gst_h265_decoder_process_slice (self, &nalu->unit.slice); return GST_FLOW_OK;
} }
static void static void
@ -991,7 +1000,6 @@ gst_h265_decoder_parse_codec_data (GstH265Decoder * self, const guint8 * data,
guint num_nals, i, j; guint num_nals, i, j;
GstH265ParserResult pres; GstH265ParserResult pres;
GstH265NalUnit nalu; GstH265NalUnit nalu;
GstFlowReturn ret = GST_FLOW_OK;
GstH265VPS vps; GstH265VPS vps;
GstH265SPS sps; GstH265SPS sps;
GstH265PPS pps; GstH265PPS pps;
@ -1044,12 +1052,6 @@ gst_h265_decoder_parse_codec_data (GstH265Decoder * self, const guint8 * data,
GST_WARNING_OBJECT (self, "Failed to parse SPS"); GST_WARNING_OBJECT (self, "Failed to parse SPS");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
ret = gst_h265_decoder_process_sps (self, &sps);
if (ret != GST_FLOW_OK) {
GST_WARNING_OBJECT (self, "Failed to process SPS");
return ret;
}
break; break;
case GST_H265_NAL_PPS: case GST_H265_NAL_PPS:
pres = gst_h265_parser_parse_pps (priv->parser, &nalu, &pps); pres = gst_h265_parser_parse_pps (priv->parser, &nalu, &pps);