From ed248e7f70d98abe099392e154d1cdd0f15faa3c Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Sun, 20 Jul 2014 09:34:58 +0200 Subject: [PATCH] hevc: wait proper position for tmvp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The position is either rounded or not checked, so delay the wait to check the proper value. Reviewed-by: Mickaël Raulet Signed-off-by: Michael Niedermayer --- libavcodec/hevc_mvs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index f36fd69e1d..52cfb29fd3 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -237,14 +237,14 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, x = x0 + nPbW; y = y0 + nPbH; - if (s->threads_type == FF_THREAD_FRAME ) - ff_thread_await_progress(&ref->tf, y, 0); if (tab_mvf && (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) && y < s->sps->height && x < s->sps->width) { x &= -16; y &= -16; + if (s->threads_type == FF_THREAD_FRAME) + ff_thread_await_progress(&ref->tf, y, 0); x_pu = x >> s->sps->log2_min_pu_size; y_pu = y >> s->sps->log2_min_pu_size; temp_col = TAB_MVF(x_pu, y_pu); @@ -257,6 +257,8 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, y = y0 + (nPbH >> 1); x &= -16; y &= -16; + if (s->threads_type == FF_THREAD_FRAME) + ff_thread_await_progress(&ref->tf, y, 0); x_pu = x >> s->sps->log2_min_pu_size; y_pu = y >> s->sps->log2_min_pu_size; temp_col = TAB_MVF(x_pu, y_pu);