mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parser: Fix return value parsing short header

Browse source 
The appropriate return value for incomplete NAL header should be
GST_H264_PARSER_NO_NAL_END. This tells the parser element to
gather more data. Previously, it would assume the NAL is corrupted
and would drop the data, potentially causing stream corruption.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3234>
This commit is contained in:
Nicolas Dufresne 2022-10-20 11:21:00 -04:00 committed by GStreamer Marge Bot
parent fed252cabd
commit dacb2a2b51
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.c
View file

@ -1507,9 +1507,9 @@ gst_h264_parser_identify_nalu_unchecked (GstH264NalParser * nalparser,
nalu->size = size - nalu->offset; nalu->size = size - nalu->offset;
if (!gst_h264_parse_nalu_header (nalu)) { if (!gst_h264_parse_nalu_header (nalu)) {
GST_WARNING ("error parsing \"NAL unit header\""); GST_DEBUG ("not enough data to parse \"NAL unit header\"");
nalu->size = 0; nalu->size = 0;
return GST_H264_PARSER_BROKEN_DATA; return GST_H264_PARSER_NO_NAL;
} }
nalu->valid = TRUE; nalu->valid = TRUE;

23
subprojects/gst-plugins-bad/tests/check/libs/h264parser.c
View file

@ -825,6 +825,28 @@ GST_START_TEST (test_h264_decoder_config_record)
GST_END_TEST; GST_END_TEST;
GST_START_TEST (test_h264_parse_partial_nal_header)
{
GstH264ParserResult res;
GstH264NalUnit nalu;
GstH264NalParser *const parser = gst_h264_nal_parser_new ();
const guint8 buf[] = { 0x00, 0x00, 0x00, 0x01, 0x0e };
guint buf_size = sizeof (buf);
/* Test that incomplete prefix NAL do return NO_NAL_END and not BROKEN_NAL.
* This also covers for SLICE_EXT. */
res = gst_h264_parser_identify_nalu (parser, buf, 0, buf_size, &nalu);
assert_equals_int (res, GST_H264_PARSER_NO_NAL);
assert_equals_int (nalu.type, GST_H264_NAL_PREFIX_UNIT);
assert_equals_int (nalu.size, 0);
gst_h264_nal_parser_free (parser);
}
GST_END_TEST;
static Suite * static Suite *
h264parser_suite (void) h264parser_suite (void)
{ {
@ -840,6 +862,7 @@ h264parser_suite (void)
tcase_add_test (tc_chain, test_h264_parse_invalid_sei); tcase_add_test (tc_chain, test_h264_parse_invalid_sei);
tcase_add_test (tc_chain, test_h264_create_sei); tcase_add_test (tc_chain, test_h264_create_sei);
tcase_add_test (tc_chain, test_h264_decoder_config_record); tcase_add_test (tc_chain, test_h264_decoder_config_record);
tcase_add_test (tc_chain, test_h264_parse_partial_nal_header);
return s; return s;
} }