mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264: initialize VA context before allocating the first slice.

Browse source 
Fix decode_slice() to ensure a VA context exists prior to creating a
new GstVaapiSliceH264, which invokes vaCreateBuffer() with some VA
context ID. i.e. the latter was not initialized, thus causing failures
on Cedar Trail for example.
This commit is contained in:
Gwenole Beauchesne 2012-12-17 04:42:29 -08:00
parent 8e8dc03677
commit 1bd5ab4db3
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -515,6 +515,9 @@ struct _GstVaapiDecoderH264Private {
/* Last decoded PPS. May not be the last activated one. Just here because /* Last decoded PPS. May not be the last activated one. Just here because
it may not fit stack memory allocation in decode_pps() */ it may not fit stack memory allocation in decode_pps() */
GstH264PPS last_pps; GstH264PPS last_pps;
/* Temporary slice header. Just here because it may not fit stack
memory allocation in decode_slice() */
GstH264SliceHdr temp_slice_hdr;
GstVaapiPictureH264 *current_picture; GstVaapiPictureH264 *current_picture;
GstVaapiFrameStore *prev_frame; GstVaapiFrameStore *prev_frame;
GstVaapiFrameStore *dpb[16]; GstVaapiFrameStore *dpb[16];
@ -2863,9 +2866,25 @@ decode_slice(GstVaapiDecoderH264 *decoder, GstH264NalUnit *nalu)
GstVaapiSliceH264 *slice = NULL; GstVaapiSliceH264 *slice = NULL;
GstH264SliceHdr *slice_hdr; GstH264SliceHdr *slice_hdr;
GstH264ParserResult result; GstH264ParserResult result;
gboolean is_first_slice = !priv->has_context;
GST_DEBUG("slice (%u bytes)", nalu->size); GST_DEBUG("slice (%u bytes)", nalu->size);
if (is_first_slice) {
slice_hdr = &priv->temp_slice_hdr;
memset(slice_hdr, 0, sizeof(*slice_hdr));
result = gst_h264_parser_parse_slice_hdr(priv->parser, nalu,
slice_hdr, TRUE, TRUE);
if (result != GST_H264_PARSER_OK) {
status = get_status(result);
goto error;
}
status = ensure_context(decoder, slice_hdr->pps->sequence);
if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
return status;
}
slice = gst_vaapi_slice_h264_new( slice = gst_vaapi_slice_h264_new(
decoder, decoder,
nalu->data + nalu->offset, nalu->data + nalu->offset,
@ -2877,12 +2896,17 @@ decode_slice(GstVaapiDecoderH264 *decoder, GstH264NalUnit *nalu)
} }
slice_hdr = &slice->slice_hdr; slice_hdr = &slice->slice_hdr;
if (is_first_slice)
memcpy(slice_hdr, &priv->temp_slice_hdr, sizeof(*slice_hdr));
else {
memset(slice_hdr, 0, sizeof(*slice_hdr)); memset(slice_hdr, 0, sizeof(*slice_hdr));
result = gst_h264_parser_parse_slice_hdr(priv->parser, nalu, slice_hdr, TRUE, TRUE); result = gst_h264_parser_parse_slice_hdr(priv->parser, nalu,
slice_hdr, TRUE, TRUE);
if (result != GST_H264_PARSER_OK) { if (result != GST_H264_PARSER_OK) {
status = get_status(result); status = get_status(result);
goto error; goto error;
} }
}
if (is_new_picture(decoder, nalu, slice_hdr)) { if (is_new_picture(decoder, nalu, slice_hdr)) {
status = decode_picture(decoder, nalu, slice_hdr); status = decode_picture(decoder, nalu, slice_hdr);