FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

h264parse: Use newly added avcC data parsing API

Browse Source 
Use gst_h264_parser_parse_decoder_config_record() method to parse
codec_data.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2449>
This commit is contained in:
Seungha Yang 2022-05-19 05:06:04 +09:00 committed by GStreamer Marge Bot
parent b48c8eaee6
commit a1b4c62b35
1 changed files with 25 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
subprojects/gst-plugins-bad/gst/videoparsers/gsth264parse.c
View File

@ -3377,11 +3377,11 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
GstStructure *str; GstStructure *str;
const GValue *codec_data_value; const GValue *codec_data_value;
GstBuffer *codec_data = NULL; GstBuffer *codec_data = NULL;
gsize size; guint format, align;
guint format, align, off; GstH264NalUnit *nalu;
GstH264NalUnit nalu;
GstH264ParserResult parseres; GstH264ParserResult parseres;
GstCaps *old_caps; GstCaps *old_caps;
GstH264DecoderConfigRecord *config = NULL;
h264parse = GST_H264_PARSE (parse); h264parse = GST_H264_PARSE (parse);
@ -3446,12 +3446,7 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
/* packetized video has codec_data (required for AVC, optional for AVC3) */ /* packetized video has codec_data (required for AVC, optional for AVC3) */
if (codec_data_value != NULL) { if (codec_data_value != NULL) {
GstMapInfo map; GstMapInfo map;
guint8 *data; guint i;
guint num_sps, num_pps;
#ifndef GST_DISABLE_GST_DEBUG
guint profile;
#endif
gint i;
GST_DEBUG_OBJECT (h264parse, "have packetized h264"); GST_DEBUG_OBJECT (h264parse, "have packetized h264");
/* make note for optional split processing */ /* make note for optional split processing */
@ -3465,67 +3460,36 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
if (!codec_data) if (!codec_data)
goto avc_caps_codec_data_missing; goto avc_caps_codec_data_missing;
gst_buffer_map (codec_data, &map, GST_MAP_READ); gst_buffer_map (codec_data, &map, GST_MAP_READ);
data = map.data;
size = map.size;
/* parse the avcC data */ parseres =
if (size < 7) { /* when numSPS==0 and numPPS==0, length is 7 bytes */ gst_h264_parser_parse_decoder_config_record (h264parse->nalparser,
map.data, map.size, &config);
if (parseres != GST_H264_PARSER_OK) {
gst_buffer_unmap (codec_data, &map); gst_buffer_unmap (codec_data, &map);
goto avcc_too_small; goto avcC_failed;
} }
/* parse the version, this must be 1 */
if (data[0] != 1) {
gst_buffer_unmap (codec_data, &map);
goto wrong_version;
}
#ifndef GST_DISABLE_GST_DEBUG
/* AVCProfileIndication */
/* profile_compat */
/* AVCLevelIndication */
profile = (data[1] << 16) | (data[2] << 8) | data[3];
GST_DEBUG_OBJECT (h264parse, "profile %06x", profile);
#endif
/* 6 bits reserved | 2 bits lengthSizeMinusOne */ h264parse->nal_length_size = config->length_size_minus_one + 1;
/* this is the number of bytes in front of the NAL units to mark their
* length */
h264parse->nal_length_size = (data[4] & 0x03) + 1;
GST_DEBUG_OBJECT (h264parse, "nal length size %u", GST_DEBUG_OBJECT (h264parse, "nal length size %u",
h264parse->nal_length_size); h264parse->nal_length_size);
GST_DEBUG_OBJECT (h264parse, "AVCProfileIndication %d",
config->profile_indication);
GST_DEBUG_OBJECT (h264parse, "profile_compatibility %d",
config->profile_compatibility);
GST_DEBUG_OBJECT (h264parse, "AVCLevelIndication %d",
config->level_indication);
num_sps = data[5] & 0x1f; for (i = 0; i < config->sps->len; i++) {
off = 6; nalu = &g_array_index (config->sps, GstH264NalUnit, i);
for (i = 0; i < num_sps; i++) { gst_h264_parse_process_nal (h264parse, nalu);
parseres = gst_h264_parser_identify_nalu_avc (h264parse->nalparser,
data, off, size, 2, &nalu);
if (parseres != GST_H264_PARSER_OK) {
gst_buffer_unmap (codec_data, &map);
goto avcc_too_small;
} }
gst_h264_parse_process_nal (h264parse, &nalu); for (i = 0; i < config->pps->len; i++) {
off = nalu.offset + nalu.size; nalu = &g_array_index (config->pps, GstH264NalUnit, i);
} gst_h264_parse_process_nal (h264parse, nalu);
if (off >= size) {
gst_buffer_unmap (codec_data, &map);
goto avcc_too_small;
}
num_pps = data[off];
off++;
for (i = 0; i < num_pps; i++) {
parseres = gst_h264_parser_identify_nalu_avc (h264parse->nalparser,
data, off, size, 2, &nalu);
if (parseres != GST_H264_PARSER_OK) {
gst_buffer_unmap (codec_data, &map);
goto avcc_too_small;
}
gst_h264_parse_process_nal (h264parse, &nalu);
off = nalu.offset + nalu.size;
} }
gst_h264_decoder_config_record_free (config);
gst_buffer_unmap (codec_data, &map); gst_buffer_unmap (codec_data, &map);
gst_buffer_replace (&h264parse->codec_data_in, codec_data); gst_buffer_replace (&h264parse->codec_data_in, codec_data);
@ -3600,14 +3564,9 @@ bytestream_caps_with_codec_data:
"expected, send SPS/PPS in-band with data or in streamheader field"); "expected, send SPS/PPS in-band with data or in streamheader field");
goto refuse_caps; goto refuse_caps;
} }
avcc_too_small: avcC_failed:
{ {
GST_DEBUG_OBJECT (h264parse, "avcC size %" G_GSIZE_FORMAT " < 8", size); GST_DEBUG_OBJECT (h264parse, "Failed to parse avcC data");
goto refuse_caps;
}
wrong_version:
{
GST_DEBUG_OBJECT (h264parse, "wrong avcC version");
goto refuse_caps; goto refuse_caps;
} }
refuse_caps: refuse_caps: