From 14ca0aa69b5d954ce56d0826ab9f1f70e535c92a Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Sun, 20 Jul 2014 09:34:58 +0200 Subject: 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: Anton Khirnov --- libavcodec/hevc_mvs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/hevc_mvs.c') diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 89b514f24e..4d0f3026da 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -267,13 +267,13 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, x = x0 + nPbW; y = y0 + nPbH; - 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 &= ~15; y &= ~15; + 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); @@ -286,6 +286,7 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, y = y0 + (nPbH >> 1); x &= ~15; y &= ~15; + 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); -- cgit v1.2.3