generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CrystalHD: Back up extradata to allow decoder reinit to work.

Browse Source 
This was a regression that came in when I switched to using the
h.264 annex b filter all the time. As the filter modifies extradata,
its use violates the statelessness assumption that exists in the
'ffmpeg' command line tool, and maybe elsewhere. It assumes that
a docoder can be reinitalised and pointed to an existing stream and
get the same results.

For now, the only way to meet this requirement is to backup the
extradata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Philip Langdale 2012-01-22 13:47:00 -08:00 committed by Michael Niedermayer
parent eaf4bf6df2
commit 9bf9c314a0
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/crystalhd.c
View File

@ -124,6 +124,9 @@ typedef struct {
AVFrame pic; AVFrame pic;
HANDLE dev; HANDLE dev;
uint8_t *orig_extradata;
uint32_t orig_extradata_size;
AVBitStreamFilterContext *bsfc; AVBitStreamFilterContext *bsfc;
AVCodecParserContext *parser; AVCodecParserContext *parser;
@ -338,6 +341,19 @@ static av_cold int uninit(AVCodecContext *avctx)
DtsCloseDecoder(device); DtsCloseDecoder(device);
DtsDeviceClose(device); DtsDeviceClose(device);
/*
* Restore original extradata, so that if the decoder is
* reinitialised, the bitstream detection and filtering
* will work as expected.
*/
if (priv->orig_extradata) {
av_free(avctx->extradata);
avctx->extradata = priv->orig_extradata;
avctx->extradata_size = priv->orig_extradata_size;
priv->orig_extradata = NULL;
priv->orig_extradata_size = 0;
}
av_parser_close(priv->parser); av_parser_close(priv->parser);
if (priv->bsfc) { if (priv->bsfc) {
av_bitstream_filter_close(priv->bsfc); av_bitstream_filter_close(priv->bsfc);
@ -402,6 +418,16 @@ static av_cold int init(AVCodecContext *avctx)
uint8_t *dummy_p; uint8_t *dummy_p;
int dummy_int; int dummy_int;
/* Back up the extradata so it can be restored at close time. */
priv->orig_extradata = av_malloc(avctx->extradata_size);
if (!priv->orig_extradata) {
av_log(avctx, AV_LOG_ERROR,
"Failed to allocate copy of extradata\n");
return AVERROR(ENOMEM);
}
priv->orig_extradata_size = avctx->extradata_size;
memcpy(priv->orig_extradata, avctx->extradata, avctx->extradata_size);
priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb"); priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb");
if (!priv->bsfc) { if (!priv->bsfc) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,