mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-04 05:22:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix VC-1 codec initialization, it really needs an extradata buffer.

Browse source
This commit is contained in:
gb 2010-04-28 22:30:50 +00:00 committed by Gwenole Beauchesne
parent 61ae27d84c
commit 1def875b95
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
View file

@ -136,6 +136,20 @@ get_profile(AVCodecContext *avctx)
return 0; return 0;
} }
/** Sets AVCodecContext.extradata with additional codec data */
static gboolean
set_codec_data(AVCodecContext *avctx, const guchar *buf, guint buf_size)
{
av_freep(&avctx->extradata);
avctx->extradata = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata)
return FALSE;
avctx->extradata_size = buf_size;
memcpy(avctx->extradata, buf, buf_size);
memset(avctx->extradata + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
return TRUE;
}
/** AVCodecContext.get_format() implementation */ /** AVCodecContext.get_format() implementation */
static enum PixelFormat static enum PixelFormat
gst_vaapi_decoder_ffmpeg_get_format(AVCodecContext *avctx, const enum PixelFormat *fmt) gst_vaapi_decoder_ffmpeg_get_format(AVCodecContext *avctx, const enum PixelFormat *fmt)
@ -262,6 +276,16 @@ gst_vaapi_decoder_ffmpeg_open(GstVaapiDecoderFfmpeg *ffdecoder, GstBuffer *buffe
if (!priv->pctx) if (!priv->pctx)
return FALSE; return FALSE;
/* XXX: av_find_stream_info() does this and some codecs really
want hard an extradata buffer for initialization (e.g. VC-1) */
if (!priv->avctx->extradata && priv->pctx->parser->split) {
const guchar *buf = GST_BUFFER_DATA(buffer);
guint buf_size = GST_BUFFER_SIZE(buffer);
buf_size = priv->pctx->parser->split(priv->avctx, buf, buf_size);
if (buf_size > 0 && !set_codec_data(priv->avctx, buf, buf_size))
return FALSE;
}
GST_VAAPI_DISPLAY_LOCK(display); GST_VAAPI_DISPLAY_LOCK(display);
ret = avcodec_open(priv->avctx, ffcodec); ret = avcodec_open(priv->avctx, ffcodec);
GST_VAAPI_DISPLAY_UNLOCK(display); GST_VAAPI_DISPLAY_UNLOCK(display);
@ -307,13 +331,8 @@ gst_vaapi_decoder_ffmpeg_create(GstVaapiDecoderFfmpeg *ffdecoder)
if (codec_data) { if (codec_data) {
const guchar *data = GST_BUFFER_DATA(codec_data); const guchar *data = GST_BUFFER_DATA(codec_data);
const guint size = GST_BUFFER_SIZE(codec_data); const guint size = GST_BUFFER_SIZE(codec_data);
av_freep(&priv->avctx->extradata); if (!set_codec_data(priv->avctx, data, size))
priv->avctx->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!priv->avctx->extradata)
return FALSE; return FALSE;
priv->avctx->extradata_size = size;
memcpy(priv->avctx->extradata, data, size);
memset(priv->avctx->extradata + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
} }
if (!priv->vactx) { if (!priv->vactx) {