Commit 5e03eea6 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/vp9: mark frame as finished on decode_tiles() failure

Fixes deadlock with framethreads
Fixes: Netflix_Aerial_1080p_60fps_8bit_420.y4m.vp9.noaltref.webm.ivf.s69372_r01-05_b6-.ivf
Fixes: Netflix_Aerial_1080p_60fps_10bit_420.y4m.vp9.noaltref.webm.ivf.s149104_r01-05_b6-.ivf
Fixes: ducks_take_off_444_720p50.y4m.vp9.webm.ivf.s107375_r01-05_b6-.ivf
Reported-by: 's avatarJames Zern <jzern@google.com>
Reviewed-by: 's avatarJames Zern <jzern@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 1c76134f
...@@ -1644,9 +1644,11 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1644,9 +1644,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
{ {
ret = decode_tiles(avctx, data, size); ret = decode_tiles(avctx, data, size);
if (ret < 0) if (ret < 0) {
ff_thread_report_progress(&s->s.frames[CUR_FRAME].tf, INT_MAX, 0);
return ret; return ret;
} }
}
// Sum all counts fields into td[0].counts for tile threading // Sum all counts fields into td[0].counts for tile threading
if (avctx->active_thread_type == FF_THREAD_SLICE) if (avctx->active_thread_type == FF_THREAD_SLICE)
......
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