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

h265parse: Allows hvc1 version 0 and fix reading of NAL count in codec_data

Browse source
This commit is contained in:
Sebastian Dröge 2014-01-06 14:52:54 +01:00
parent 57c195eed8
commit 63fee31a3f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/videoparsers/gsth265parse.c
View file

@ -1771,8 +1771,9 @@ gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
gst_buffer_unmap (codec_data, &map); gst_buffer_unmap (codec_data, &map);
goto hvcc_too_small; goto hvcc_too_small;
} }
/* parse the version, this must be one */ /* parse the version, this must be one but
if (data[0] != 1) { * is zero until the spec is finalized */
if (data[0] != 0 && data[0] != 1) {
gst_buffer_unmap (codec_data, &map); gst_buffer_unmap (codec_data, &map);
goto wrong_version; goto wrong_version;
} }
@ -1783,7 +1784,7 @@ gst_h265_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
off = 23; off = 23;
for (i = 0; i < data[22]; i++) { for (i = 0; i < data[22]; i++) {
num_nals = (data[off + 1] >> 7) | data[off + 2]; num_nals = GST_READ_UINT16_BE (data + off + 1);
for (j = 0; j < num_nals; j++) { for (j = 0; j < num_nals; j++) {
parseres = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser, parseres = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
data, off + 3, size, 2, &nalu); data, off + 3, size, 2, &nalu);