Commit 5b0fc078 authored by Ronald S. Bultje's avatar Ronald S. Bultje

vp9: reset contextual caches on frame size change with mt enabled.

Fixes crash/valgrind errors in trac ticket 3188 and hang in 3274.
parent 04a187fb
...@@ -3450,6 +3450,13 @@ static void adapt_probs(VP9Context *s) ...@@ -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) static av_cold int vp9_decode_free(AVCodecContext *ctx)
{ {
VP9Context *s = ctx->priv_data; VP9Context *s = ctx->priv_data;
...@@ -3468,11 +3475,9 @@ static av_cold int vp9_decode_free(AVCodecContext *ctx) ...@@ -3468,11 +3475,9 @@ static av_cold int vp9_decode_free(AVCodecContext *ctx)
ff_thread_release_buffer(ctx, &s->next_refs[i]); ff_thread_release_buffer(ctx, &s->next_refs[i]);
av_frame_free(&s->next_refs[i].f); av_frame_free(&s->next_refs[i].f);
} }
av_freep(&s->above_partition_ctx); free_buffers(s);
av_freep(&s->c_b); av_freep(&s->c_b);
s->c_b_size = 0; s->c_b_size = 0;
av_freep(&s->b_base);
av_freep(&s->block_base);
return 0; return 0;
} }
...@@ -3762,7 +3767,10 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo ...@@ -3762,7 +3767,10 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
int i, res; int i, res;
VP9Context *s = dst->priv_data, *ssrc = src->priv_data; 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++) { for (i = 0; i < 2; i++) {
if (s->frames[i].tf.f->data[0]) if (s->frames[i].tf.f->data[0])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment