mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

Try to improve heuristics to use an AVCodecContextParser.

Browse source
This commit is contained in:
gb 2010-05-03 16:17:51 +00:00 committed by Gwenole Beauchesne
parent dbe1d622ef
commit 24d918b7a3
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,7 +315,7 @@ gst_vaapi_decoder_ffmpeg_open(GstVaapiDecoderFfmpeg *ffdecoder, GstBuffer *buffe
GstVaapiCodec codec = GST_VAAPI_DECODER_CODEC(ffdecoder); GstVaapiCodec codec = GST_VAAPI_DECODER_CODEC(ffdecoder);
enum CodecID codec_id; enum CodecID codec_id;
AVCodec *ffcodec; AVCodec *ffcodec;
gboolean parser_is_needed; gboolean try_parser, need_parser;
int ret; int ret;
gst_vaapi_decoder_ffmpeg_close(ffdecoder); gst_vaapi_decoder_ffmpeg_close(ffdecoder);
@ -339,36 +339,45 @@ gst_vaapi_decoder_ffmpeg_open(GstVaapiDecoderFfmpeg *ffdecoder, GstBuffer *buffe
case CODEC_ID_H264: case CODEC_ID_H264:
/* For AVC1 formats, sequence headers are in extradata and /* For AVC1 formats, sequence headers are in extradata and
input encoded buffers represent the whole NAL unit */ input encoded buffers represent the whole NAL unit */
parser_is_needed = priv->avctx->extradata_size == 0; try_parser = priv->avctx->extradata_size == 0;
need_parser = try_parser;
break; break;
case CODEC_ID_WMV3: case CODEC_ID_WMV3:
/* There is no WMV3 parser in FFmpeg */ /* There is no WMV3 parser in FFmpeg */
parser_is_needed = FALSE; try_parser = FALSE;
need_parser = FALSE;
break; break;
case CODEC_ID_VC1: case CODEC_ID_VC1:
/* For VC-1, sequence headers ae in extradata and input encoded /* For VC-1, sequence headers ae in extradata and input encoded
buffers represent the whole slice */ buffers represent the whole slice */
parser_is_needed = FALSE; try_parser = priv->avctx->extradata_size == 0;
need_parser = FALSE;
break; break;
default: default:
parser_is_needed = TRUE; try_parser = TRUE;
need_parser = TRUE;
break; break;
} }
if (parser_is_needed) { if (try_parser) {
priv->pctx = av_parser_init(codec_id); priv->pctx = av_parser_init(codec_id);
if (!priv->pctx) if (!priv->pctx && need_parser)
return FALSE; return FALSE;
}
/* XXX: av_find_stream_info() does this and some codecs really /* XXX: av_find_stream_info() does this and some codecs really
want hard an extradata buffer for initialization (e.g. VC-1) */ want hard an extradata buffer for initialization (e.g. VC-1) */
if (!priv->avctx->extradata && priv->pctx->parser->split) { if (!priv->avctx->extradata && priv->pctx && priv->pctx->parser->split) {
const guchar *buf = GST_BUFFER_DATA(buffer); const guchar *buf = GST_BUFFER_DATA(buffer);
guint buf_size = GST_BUFFER_SIZE(buffer); guint buf_size = GST_BUFFER_SIZE(buffer);
buf_size = priv->pctx->parser->split(priv->avctx, buf, buf_size); buf_size = priv->pctx->parser->split(priv->avctx, buf, buf_size);
if (buf_size > 0 && !set_codec_data(priv->avctx, buf, buf_size)) if (buf_size > 0 && !set_codec_data(priv->avctx, buf, buf_size))
return FALSE; return FALSE;
} }
if (priv->pctx && !need_parser) {
av_parser_close(priv->pctx);
priv->pctx = NULL;
} }
/* Use size information from the demuxer, whenever available */ /* Use size information from the demuxer, whenever available */