RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hevc/mvs: more cleanups 

cherry picked from commit c4e467e79f59453783c97bc6044082edb7a6468b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mickaël Raulet 2014-07-19 01:38:06 +02:00 committed by Michael Niedermayer
parent 3ad0460831
commit cd714afe81
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/hevc_mvs.c
View File

@ -52,8 +52,7 @@ void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0,
((x0b + nPbW) == (1 << s->sps->log2_ctb_size)) ? ((x0b + nPbW) == (1 << s->sps->log2_ctb_size)) ?
lc->ctb_up_right_flag && !y0b : lc->na.cand_up; lc->ctb_up_right_flag && !y0b : lc->na.cand_up;
lc->na.cand_up_right = lc->na.cand_up_right =
((x0b + nPbW) == (1 << s->sps->log2_ctb_size) ? lc->na.cand_up_right_sap
lc->ctb_up_right_flag && !y0b : lc->na.cand_up )
&& (x0 + nPbW) < lc->end_of_tiles_x; && (x0 + nPbW) < lc->end_of_tiles_x;
lc->na.cand_bottom_left = ((y0 + nPbH) >= lc->end_of_tiles_y) ? 0 : lc->na.cand_left; lc->na.cand_bottom_left = ((y0 + nPbH) >= lc->end_of_tiles_y) ? 0 : lc->na.cand_left;
} }
@ -71,12 +70,6 @@ static int z_scan_block_avail(HEVCContext *s, int xCurr, int yCurr,
int yCurr_ctb = yCurr >> s->sps->log2_ctb_size; int yCurr_ctb = yCurr >> s->sps->log2_ctb_size;
int xN_ctb = xN >> s->sps->log2_ctb_size; int xN_ctb = xN >> s->sps->log2_ctb_size;
int yN_ctb = yN >> s->sps->log2_ctb_size; int yN_ctb = yN >> s->sps->log2_ctb_size;
if (xN < 0 || yN < 0 ||
xN >= s->sps->width ||
yN >= s->sps->height)
return 0;
if( yN_ctb < yCurr_ctb || xN_ctb < xCurr_ctb ) if( yN_ctb < yCurr_ctb || xN_ctb < xCurr_ctb )
return 1; return 1;
else { else {