mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parser lib: Warn on invalid pic_timing SEI

Browse source 
The spec calls for pic_timing SEI to be absent unless
there's either a CpbDpbDelaysPresentFlag or
pic_struct_present_flag in the SPS VUI data. If
both those flags are missing, warn.
This commit is contained in:
Jan Schmidt 2019-06-28 14:46:36 +10:00
parent 75ce024b1e
commit 81c20cadea
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/codecparsers/gsth264parser.c
View file

@ -965,6 +965,8 @@ gst_h264_parser_parse_pic_timing (GstH264NalParser * nalparser,
GstH264PicTiming * tim, NalReader * nr) GstH264PicTiming * tim, NalReader * nr)
{ {
GstH264ParserResult error = GST_H264_PARSER_ERROR; GstH264ParserResult error = GST_H264_PARSER_ERROR;
gboolean CpbDpbDelaysPresentFlag = FALSE;
gboolean pic_struct_present_flag = FALSE;
GST_DEBUG ("parsing \"Picture timing\""); GST_DEBUG ("parsing \"Picture timing\"");
if (!nalparser->last_sps || !nalparser->last_sps->valid) { if (!nalparser->last_sps || !nalparser->last_sps->valid) {
@ -977,6 +979,11 @@ gst_h264_parser_parse_pic_timing (GstH264NalParser * nalparser,
if (nalparser->last_sps->vui_parameters_present_flag) { if (nalparser->last_sps->vui_parameters_present_flag) {
GstH264VUIParams *vui = &nalparser->last_sps->vui_parameters; GstH264VUIParams *vui = &nalparser->last_sps->vui_parameters;
CpbDpbDelaysPresentFlag = vui->nal_hrd_parameters_present_flag
|| vui->vcl_hrd_parameters_present_flag;
tim->pic_struct_present_flag = pic_struct_present_flag =
vui->pic_struct_present_flag;
if (vui->nal_hrd_parameters_present_flag) { if (vui->nal_hrd_parameters_present_flag) {
READ_UINT32 (nr, tim->cpb_removal_delay, READ_UINT32 (nr, tim->cpb_removal_delay,
vui->nal_hrd_parameters.cpb_removal_delay_length_minus1 + 1); vui->nal_hrd_parameters.cpb_removal_delay_length_minus1 + 1);
@ -989,14 +996,13 @@ gst_h264_parser_parse_pic_timing (GstH264NalParser * nalparser,
vui->vcl_hrd_parameters.dpb_output_delay_length_minus1 + 1); vui->vcl_hrd_parameters.dpb_output_delay_length_minus1 + 1);
} }
if (vui->pic_struct_present_flag) { if (pic_struct_present_flag) {
const guint8 num_clock_ts_table[9] = { const guint8 num_clock_ts_table[9] = {
1, 1, 1, 2, 2, 3, 3, 2, 3 1, 1, 1, 2, 2, 3, 3, 2, 3
}; };
guint8 num_clock_num_ts; guint8 num_clock_num_ts;
guint i; guint i;
tim->pic_struct_present_flag = TRUE;
READ_UINT8 (nr, tim->pic_struct, 4); READ_UINT8 (nr, tim->pic_struct, 4);
CHECK_ALLOWED ((gint8) tim->pic_struct, 0, 8); CHECK_ALLOWED ((gint8) tim->pic_struct, 0, 8);
@ -1012,6 +1018,12 @@ gst_h264_parser_parse_pic_timing (GstH264NalParser * nalparser,
} }
} }
if (!CpbDpbDelaysPresentFlag && !pic_struct_present_flag) {
GST_WARNING
("Invalid pic_timing SEI NAL with neither CpbDpbDelays nor pic_struct");
return GST_H264_PARSER_BROKEN_DATA;
}
return GST_H264_PARSER_OK; return GST_H264_PARSER_OK;
error: error: