diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-07-20 09:34:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-08-12 10:13:21 +0000 |
| commit | 14ca0aa69b5d954ce56d0826ab9f1f70e535c92a (patch) | |
| tree | 4ecf339aa9f5cf02c059917fcc21cea2acf204f9 | |
| parent | cf6090dc6252f2b276aa4133e3d73a89f4c6046c (diff) | |
| download | ffmpeg-14ca0aa69b5d954ce56d0826ab9f1f70e535c92a.tar.gz | |
hevc: wait proper position for tmvp
The position is either rounded or not checked, so delay the wait to
check the proper value.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/hevc_mvs.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |