Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hevc: wait proper position for tmvp

Browse Source 
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>
pull/80/head
Christophe Gisquet 11 years ago committed by Anton Khirnov
parent cf6090dc62
commit 14ca0aa69b
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavcodec/hevc_mvs.c

3
libavcodec/hevc_mvs.c
Unescape View File

@ -267,13 +267,13 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
x = x0 + nPbW; x = x0 + nPbW;
y = y0 + nPbH; y = y0 + nPbH;
ff_thread_await_progress(&ref->tf, y, 0);
if (tab_mvf && if (tab_mvf &&
(y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) && (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) &&
y < s->sps->height && y < s->sps->height &&
x < s->sps->width) { x < s->sps->width) {
x &= ~15; x &= ~15;
y &= ~15; y &= ~15;
ff_thread_await_progress(&ref->tf, y, 0);
x_pu = x >> s->sps->log2_min_pu_size; x_pu = x >> s->sps->log2_min_pu_size;
y_pu = y >> s->sps->log2_min_pu_size; y_pu = y >> s->sps->log2_min_pu_size;
temp_col = TAB_MVF(x_pu, y_pu); 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); y = y0 + (nPbH >> 1);
x &= ~15; x &= ~15;
y &= ~15; y &= ~15;
ff_thread_await_progress(&ref->tf, y, 0);
x_pu = x >> s->sps->log2_min_pu_size; x_pu = x >> s->sps->log2_min_pu_size;
y_pu = y >> s->sps->log2_min_pu_size; y_pu = y >> s->sps->log2_min_pu_size;
temp_col = TAB_MVF(x_pu, y_pu); temp_col = TAB_MVF(x_pu, y_pu);

Write Preview
Loading…
Cancel
Save