mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264: handle avcC format for decoding buffers.

Browse source
This commit is contained in:
Gwenole Beauchesne 2012-01-17 10:42:49 +01:00
parent 6d61965531
commit 5a795b439c
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -285,6 +285,7 @@ struct _GstVaapiDecoderH264Private {
gint32 prev_frame_num; // prevFrameNum gint32 prev_frame_num; // prevFrameNum
guint is_constructed : 1; guint is_constructed : 1;
guint is_opened : 1; guint is_opened : 1;
guint is_avc : 1;
}; };
static gboolean static gboolean
@ -1769,11 +1770,20 @@ decode_buffer(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
buf_size = GST_BUFFER_SIZE(buffer); buf_size = GST_BUFFER_SIZE(buffer);
ofs = 0; ofs = 0;
do { do {
result = gst_h264_parser_identify_nalu( if (priv->is_avc) {
priv->parser, result = gst_h264_parser_identify_nalu_avc(
buf, ofs, buf_size, priv->parser,
&nalu buf, ofs, buf_size, priv->nal_length_size,
); &nalu
);
}
else {
result = gst_h264_parser_identify_nalu(
priv->parser,
buf, ofs, buf_size,
&nalu
);
}
status = get_status(result); status = get_status(result);
if (status == GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA) { if (status == GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA) {
@ -1807,7 +1817,7 @@ decode_buffer(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER; status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
break; break;
} }
} while (status == GST_VAAPI_DECODER_STATUS_SUCCESS); } while (status == GST_VAAPI_DECODER_STATUS_SUCCESS && ofs < buf_size);
return status; return status;
} }
@ -1872,6 +1882,8 @@ decode_codec_data(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
return status; return status;
ofs = nalu.offset + nalu.size; ofs = nalu.offset + nalu.size;
} }
priv->is_avc = TRUE;
return status; return status;
} }
@ -1977,6 +1989,7 @@ gst_vaapi_decoder_h264_init(GstVaapiDecoderH264 *decoder)
priv->prev_frame_num = 0; priv->prev_frame_num = 0;
priv->is_constructed = FALSE; priv->is_constructed = FALSE;
priv->is_opened = FALSE; priv->is_opened = FALSE;
priv->is_avc = FALSE;
memset(priv->dpb, 0, sizeof(priv->dpb)); memset(priv->dpb, 0, sizeof(priv->dpb));
memset(priv->short_ref, 0, sizeof(priv->short_ref)); memset(priv->short_ref, 0, sizeof(priv->short_ref));