shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix a motion vector out of range bug"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1958,6 +1958,10 @@

           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. */

@@ -2004,6 +2008,11 @@

               cpi, x, bsize, &mvp_full, step_param, sadpb,

               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;