mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoparsers: h265: Be less restrictive between PPS and SPS parsing order

Browse source 
Allow to parse PPS to be parser even if SPS hasn't been parsered before.
This help to parse VPSSPSPPS_A_MainConcept_1 conformance test

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
This commit is contained in:
Benjamin Gaignard 2022-05-16 15:27:40 +02:00 committed by Nicolas Dufresne
parent 5ae05bb42a
commit a275e1e029
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-bad/gst/videoparsers/gsth265parse.c
View file

@ -797,14 +797,8 @@ gst_h265_parse_process_nal (GstH265Parse * h265parse, GstH265NalUnit * nalu)
h265parse->state |= GST_H265_PARSE_STATE_GOT_SPS; h265parse->state |= GST_H265_PARSE_STATE_GOT_SPS;
break; break;
case GST_H265_NAL_PPS: case GST_H265_NAL_PPS:
/* expected state: got-sps */
h265parse->state &= GST_H265_PARSE_STATE_GOT_SPS;
if (!GST_H265_PARSE_STATE_VALID (h265parse, GST_H265_PARSE_STATE_GOT_SPS))
return FALSE;
pres = gst_h265_parser_parse_pps (nalparser, nalu, &pps); pres = gst_h265_parser_parse_pps (nalparser, nalu, &pps);
/* arranged for a fallback pps.id, so use that one and only warn */ /* arranged for a fallback pps.id, so use that one and only warn */
if (pres != GST_H265_PARSER_OK) { if (pres != GST_H265_PARSER_OK) {
GST_WARNING_OBJECT (h265parse, "failed to parse PPS:"); GST_WARNING_OBJECT (h265parse, "failed to parse PPS:");
@ -960,16 +954,8 @@ gst_h265_parse_process_nal (GstH265Parse * h265parse, GstH265NalUnit * nalu)
break; break;
} }
case GST_H265_NAL_AUD: case GST_H265_NAL_AUD:
/* Just accumulate AU Delimiter, whether it's before SPS or not */
pres = gst_h265_parser_parse_nal (nalparser, nalu);
if (pres != GST_H265_PARSER_OK)
return FALSE;
break;
default: default:
/* drop anything before the initial SPS */ /* Just accumulate AU Delimiter, whether it's before SPS or not */
if (!GST_H265_PARSE_STATE_VALID (h265parse, GST_H265_PARSE_STATE_GOT_SPS))
return FALSE;
pres = gst_h265_parser_parse_nal (nalparser, nalu); pres = gst_h265_parser_parse_nal (nalparser, nalu);
if (pres != GST_H265_PARSER_OK) if (pres != GST_H265_PARSER_OK)
return FALSE; return FALSE;