diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-06-23 08:16:11 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 19:13:58 +0400 |
commit | c329713de7c6bdfe58eec687487e7b79d72a2833 (patch) | |
tree | 0770267287d742232369d5728954dd143255ecad /libavcodec/vp8.c | |
parent | fb0df5c113e0dff2311201dc828db1648174972b (diff) |
vp8: wait for prev_frame to parse segment_map before reading it.
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
-rw-r--r-- | libavcodec/vp8.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 553e5c884d..9848802dbb 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1680,6 +1680,11 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, if (s->mb_layout == 1) mb = s->macroblocks_base + ((s->mb_width+1)*(mb_y + 1) + 1); else { + // Make sure the previous frame has read its segmentation map, + // if we re-use the same map. + if (prev_frame && s->segmentation.enabled && + !s->segmentation.update_map) + ff_thread_await_progress(&prev_frame->tf, mb_y, 0); mb = s->macroblocks + (s->mb_height - mb_y - 1)*2; memset(mb - 1, 0, sizeof(*mb)); // zero left macroblock AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED*0x01010101); @@ -1959,13 +1964,14 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, memset(s->ref_count, 0, sizeof(s->ref_count)); - // Make sure the previous frame has read its segmentation map, - // if we re-use the same map. - if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) - ff_thread_await_progress(&prev_frame->tf, 1, 0); - - if (s->mb_layout == 1) + if (s->mb_layout == 1) { + // Make sure the previous frame has read its segmentation map, + // if we re-use the same map. + if (prev_frame && s->segmentation.enabled && + !s->segmentation.update_map) + ff_thread_await_progress(&prev_frame->tf, 1, 0); vp8_decode_mv_mb_modes(avctx, curframe, prev_frame); + } if (avctx->active_thread_type == FF_THREAD_FRAME) num_jobs = 1; |