From 5b0fc078191138795e817244555741356f9d12e9 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 7 Jan 2014 07:24:31 -0500 Subject: [PATCH] vp9: reset contextual caches on frame size change with mt enabled. Fixes crash/valgrind errors in trac ticket 3188 and hang in 3274. --- libavcodec/vp9.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 78b8d2c23b2..ca6795f169c 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3450,6 +3450,13 @@ static void adapt_probs(VP9Context *s) } } +static void free_buffers(VP9Context *s) +{ + av_freep(&s->above_partition_ctx); + av_freep(&s->b_base); + av_freep(&s->block_base); +} + static av_cold int vp9_decode_free(AVCodecContext *ctx) { VP9Context *s = ctx->priv_data; @@ -3468,11 +3475,9 @@ static av_cold int vp9_decode_free(AVCodecContext *ctx) ff_thread_release_buffer(ctx, &s->next_refs[i]); av_frame_free(&s->next_refs[i].f); } - av_freep(&s->above_partition_ctx); + free_buffers(s); av_freep(&s->c_b); s->c_b_size = 0; - av_freep(&s->b_base); - av_freep(&s->block_base); return 0; } @@ -3762,7 +3767,10 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo int i, res; VP9Context *s = dst->priv_data, *ssrc = src->priv_data; - // FIXME scalability, size, etc. + // detect size changes in other threads + if (s->above_partition_ctx && (s->cols != ssrc->cols || s->rows != ssrc->rows)) { + free_buffers(s); + } for (i = 0; i < 2; i++) { if (s->frames[i].tf.f->data[0]) -- 2.39.2