Merge "Fix a motion vector out of range bug"

This commit is contained in:
Yunqing Wang 2016-08-08 17:59:47 +00:00 committed by Gerrit Code Review
commit 6a8d4631a8

View File

@ -1958,6 +1958,10 @@ static int64_t rd_pick_best_sub8x8_mode(
MV mvp_full;
int max_mv;
int cost_list[5];
int tmp_col_min = x->mv_col_min;
int tmp_col_max = x->mv_col_max;
int tmp_row_min = x->mv_row_min;
int tmp_row_max = x->mv_row_max;
/* Is the best so far sufficiently good that we cant justify doing
* and new motion search. */
@ -2005,6 +2009,11 @@ static int64_t rd_pick_best_sub8x8_mode(
sf->mv.subpel_search_method != SUBPEL_TREE ? cost_list : NULL,
&bsi->ref_mv[0]->as_mv, new_mv, INT_MAX, 1);
x->mv_col_min = tmp_col_min;
x->mv_col_max = tmp_col_max;
x->mv_row_min = tmp_row_min;
x->mv_row_max = tmp_row_max;
if (bestsme < UINT_MAX) {
uint32_t distortion;
cpi->find_fractional_mv_step(