vp3/theora: flush after seek.

This commit is contained in:
Ronald S. Bultje 2011-07-26 10:58:29 -07:00
parent e0e65ddb88
commit 8dcf518430
1 changed files with 22 additions and 0 deletions

View File

@ -2321,6 +2321,26 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
return vp3_decode_init(avctx); return vp3_decode_init(avctx);
} }
static void vp3_decode_flush(AVCodecContext *avctx)
{
Vp3DecodeContext *s = avctx->priv_data;
if (s->golden_frame.data[0]) {
if (s->golden_frame.data[0] == s->last_frame.data[0])
memset(&s->last_frame, 0, sizeof(AVFrame));
if (s->current_frame.data[0] == s->golden_frame.data[0])
memset(&s->current_frame, 0, sizeof(AVFrame));
ff_thread_release_buffer(avctx, &s->golden_frame);
}
if (s->last_frame.data[0]) {
if (s->current_frame.data[0] == s->last_frame.data[0])
memset(&s->current_frame, 0, sizeof(AVFrame));
ff_thread_release_buffer(avctx, &s->last_frame);
}
if (s->current_frame.data[0])
ff_thread_release_buffer(avctx, &s->current_frame);
}
AVCodec ff_theora_decoder = { AVCodec ff_theora_decoder = {
"theora", "theora",
AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_VIDEO,
@ -2332,6 +2352,7 @@ AVCodec ff_theora_decoder = {
vp3_decode_frame, vp3_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
NULL, NULL,
.flush = vp3_decode_flush,
.long_name = NULL_IF_CONFIG_SMALL("Theora"), .long_name = NULL_IF_CONFIG_SMALL("Theora"),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context)
}; };
@ -2348,6 +2369,7 @@ AVCodec ff_vp3_decoder = {
vp3_decode_frame, vp3_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
NULL, NULL,
.flush = vp3_decode_flush,
.long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context)
}; };