h265decoder: Use gst_h265_parser_parse_decoder_config_record()
Stop duplicating code and use newly added parsing method instead Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
This commit is contained in:
parent
8c596aeb5b
commit
bc8a862e20
@ -1002,80 +1002,66 @@ gst_h265_decoder_parse_codec_data (GstH265Decoder * self, const guint8 * data,
|
|||||||
gsize size)
|
gsize size)
|
||||||
{
|
{
|
||||||
GstH265DecoderPrivate *priv = self->priv;
|
GstH265DecoderPrivate *priv = self->priv;
|
||||||
guint num_nal_arrays;
|
GstH265Parser *parser = priv->parser;
|
||||||
guint off;
|
|
||||||
guint num_nals, i, j;
|
|
||||||
GstH265ParserResult pres;
|
GstH265ParserResult pres;
|
||||||
GstH265NalUnit nalu;
|
GstFlowReturn ret = GST_FLOW_ERROR;
|
||||||
GstH265VPS vps;
|
GstH265VPS vps;
|
||||||
GstH265SPS sps;
|
GstH265SPS sps;
|
||||||
GstH265PPS pps;
|
GstH265PPS pps;
|
||||||
|
GstH265DecoderConfigRecord *config = NULL;
|
||||||
|
guint i, j;
|
||||||
|
|
||||||
/* parse the hvcC data */
|
pres = gst_h265_parser_parse_decoder_config_record (parser,
|
||||||
if (size < 23) {
|
data, size, &config);
|
||||||
GST_WARNING_OBJECT (self, "hvcC too small");
|
if (pres != GST_H265_PARSER_OK) {
|
||||||
|
GST_WARNING_OBJECT (self, "Failed to parse hvcC data");
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wrong hvcC version */
|
priv->nal_length_size = config->length_size_minus_one + 1;
|
||||||
if (data[0] != 0 && data[0] != 1) {
|
|
||||||
return GST_FLOW_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv->nal_length_size = (data[21] & 0x03) + 1;
|
|
||||||
GST_DEBUG_OBJECT (self, "nal length size %u", priv->nal_length_size);
|
GST_DEBUG_OBJECT (self, "nal length size %u", priv->nal_length_size);
|
||||||
|
|
||||||
num_nal_arrays = data[22];
|
for (i = 0; i < config->nalu_array->len; i++) {
|
||||||
off = 23;
|
GstH265DecoderConfigRecordNalUnitArray *array =
|
||||||
|
&g_array_index (config->nalu_array,
|
||||||
|
GstH265DecoderConfigRecordNalUnitArray, i);
|
||||||
|
|
||||||
for (i = 0; i < num_nal_arrays; i++) {
|
for (j = 0; j < array->nalu->len; j++) {
|
||||||
if (off + 3 >= size) {
|
GstH265NalUnit *nalu = &g_array_index (array->nalu, GstH265NalUnit, j);
|
||||||
GST_WARNING_OBJECT (self, "hvcC too small");
|
|
||||||
return GST_FLOW_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
num_nals = GST_READ_UINT16_BE (data + off + 1);
|
switch (nalu->type) {
|
||||||
off += 3;
|
|
||||||
for (j = 0; j < num_nals; j++) {
|
|
||||||
pres = gst_h265_parser_identify_nalu_hevc (priv->parser,
|
|
||||||
data, off, size, 2, &nalu);
|
|
||||||
|
|
||||||
if (pres != GST_H265_PARSER_OK) {
|
|
||||||
GST_WARNING_OBJECT (self, "hvcC too small");
|
|
||||||
return GST_FLOW_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (nalu.type) {
|
|
||||||
case GST_H265_NAL_VPS:
|
case GST_H265_NAL_VPS:
|
||||||
pres = gst_h265_parser_parse_vps (priv->parser, &nalu, &vps);
|
pres = gst_h265_parser_parse_vps (parser, nalu, &vps);
|
||||||
if (pres != GST_H265_PARSER_OK) {
|
if (pres != GST_H265_PARSER_OK) {
|
||||||
GST_WARNING_OBJECT (self, "Failed to parse VPS");
|
GST_WARNING_OBJECT (self, "Failed to parse VPS");
|
||||||
return GST_FLOW_ERROR;
|
goto out;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GST_H265_NAL_SPS:
|
case GST_H265_NAL_SPS:
|
||||||
pres = gst_h265_parser_parse_sps (priv->parser, &nalu, &sps, TRUE);
|
pres = gst_h265_parser_parse_sps (parser, nalu, &sps, TRUE);
|
||||||
if (pres != GST_H265_PARSER_OK) {
|
if (pres != GST_H265_PARSER_OK) {
|
||||||
GST_WARNING_OBJECT (self, "Failed to parse SPS");
|
GST_WARNING_OBJECT (self, "Failed to parse SPS");
|
||||||
return GST_FLOW_ERROR;
|
goto out;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GST_H265_NAL_PPS:
|
case GST_H265_NAL_PPS:
|
||||||
pres = gst_h265_parser_parse_pps (priv->parser, &nalu, &pps);
|
pres = gst_h265_parser_parse_pps (parser, nalu, &pps);
|
||||||
if (pres != GST_H265_PARSER_OK) {
|
if (pres != GST_H265_PARSER_OK) {
|
||||||
GST_WARNING_OBJECT (self, "Failed to parse PPS");
|
GST_WARNING_OBJECT (self, "Failed to parse PPS");
|
||||||
return GST_FLOW_ERROR;
|
goto out;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
off = nalu.offset + nalu.size;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return GST_FLOW_OK;
|
ret = GST_FLOW_OK;
|
||||||
|
|
||||||
|
out:
|
||||||
|
gst_h265_decoder_config_record_free (config);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
Loading…
x
Reference in New Issue
Block a user