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

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

Browse Source 
Fixes crash/valgrind errors in trac ticket 3188 and hang in 3274.
This commit is contained in:
Ronald S. Bultje 2014-01-07 07:24:31 -05:00
parent 04a187fb2a
commit 5b0fc07819
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/vp9.c
View File

@ -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])