mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

h266parser: do not fail when extension flags are set

Browse source 
For VPS, PPS, APS, OPI and DCI, the extension flags are the last syntax
in the structures, and according to the spec, should be ignored if set to 1.

Therefore, we can just ignore them rather than failing.

This fixes a few failures in fluster, like in the PSEXT_A_Nokia_2 stream.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8359>
This commit is contained in:
Carlos Bentzen 2025-01-31 00:26:38 +01:00 committed by GStreamer Marge Bot
parent 3a12b0beaa
commit be98ba00d7
1 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth266parser.c
View file

@ -2546,10 +2546,8 @@ gst_h266_parse_vps (GstH266NalUnit * nalu, GstH266VPS * vps)
} }
READ_UINT8 (&nr, vps->extension_flag, 1); READ_UINT8 (&nr, vps->extension_flag, 1);
if (vps->extension_flag) { if (vps->extension_flag)
GST_WARNING ("extension_flag is not supported in current version VPS."); GST_WARNING ("extension_flag not supported. Ignoring extension data.");
goto error;
}
if (!gst_h266_parser_check_vps (vps)) if (!gst_h266_parser_check_vps (vps))
goto error; goto error;
@ -4288,10 +4286,8 @@ gst_h266_parse_pps (GstH266Parser * parser, GstH266NalUnit * nalu,
READ_UINT8 (&nr, pps->slice_header_extension_present_flag, 1); READ_UINT8 (&nr, pps->slice_header_extension_present_flag, 1);
READ_UINT8 (&nr, pps->extension_flag, 1); READ_UINT8 (&nr, pps->extension_flag, 1);
if (pps->extension_flag) { if (pps->extension_flag)
GST_WARNING ("extension_flag is not supported in current version pps."); GST_WARNING ("extension_flag not supported. Ignoring extension data.");
goto error;
}
/* calculate width and height */ /* calculate width and height */
pps->width = pps->pic_width_in_luma_samples; pps->width = pps->pic_width_in_luma_samples;
@ -4399,14 +4395,8 @@ gst_h266_parse_aps (GstH266Parser * parser, GstH266NalUnit * nalu,
} }
READ_UINT8 (&nr, aps->extension_flag, 1); READ_UINT8 (&nr, aps->extension_flag, 1);
if (aps->extension_flag) { if (aps->extension_flag)
READ_UINT8 (&nr, aps->extension_data_flag, 1); GST_WARNING ("extension_flag not supported. Ignoring extension data.");
if (aps->extension_data_flag) {
GST_WARNING ("extension_data_flag shall be equal to 0 "
"in current version aps.");
goto error;
}
}
aps->valid = TRUE; aps->valid = TRUE;
return GST_H266_PARSER_OK; return GST_H266_PARSER_OK;
@ -4492,14 +4482,8 @@ gst_h266_parser_parse_opi (GstH266Parser * parser,
READ_UINT8 (&nr, opi->htid_plus1, 3); READ_UINT8 (&nr, opi->htid_plus1, 3);
READ_UINT8 (&nr, opi->extension_flag, 1); READ_UINT8 (&nr, opi->extension_flag, 1);
if (opi->extension_flag) { if (opi->extension_flag)
GST_WARNING ("extension_flag is not supported in current version OPI."); GST_WARNING ("extension_flag not supported. Ignoring extension data.");
goto error;
}
/* Skip the byte alignment bits */
if (!nal_reader_skip (&nr, 1))
goto error;
return GST_H266_PARSER_OK; return GST_H266_PARSER_OK;
@ -4545,14 +4529,8 @@ gst_h266_parser_parse_dci (GstH266Parser * parser,
} }
READ_UINT8 (&nr, dci->extension_flag, 1); READ_UINT8 (&nr, dci->extension_flag, 1);
if (dci->extension_flag) { if (dci->extension_flag)
GST_WARNING ("extension_flag is not supported in current version DCI."); GST_WARNING ("extension_flag not supported. Ignoring extension data.");
goto error;
}
/* Skip the byte alignment bits */
if (!nal_reader_skip (&nr, 1))
goto error;
return GST_H266_PARSER_OK; return GST_H266_PARSER_OK;