]> granicus.if.org Git - libvpx/commitdiff
Merge "Replacing int_mv with MV in full_pixel_motion_search()."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 6 Mar 2014 05:44:54 +0000 (21:44 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 6 Mar 2014 05:44:54 +0000 (21:44 -0800)
1  2 
vp9/encoder/vp9_pickmode.c

index 75122bc6fe5777eab3a9a8f9818a3c7fe43dde62,dda75b80bd35eca457eba9e69ba8235704021867..74be362239ba4e98cd05ebe94616c65efa3e2bbb
@@@ -87,28 -88,22 +87,28 @@@ static int full_pixel_motion_search(VP9
    mvp_full.row >>= 3;
  
    if (cpi->sf.search_method == FAST_HEX) {
 -    bestsme = vp9_fast_hex_search(x, &mvp_full, step_param, sadpb,
 +    // NOTE: this returns SAD
 +    bestsme = vp9_fast_hex_search(x, &mvp_full, step_param, sadpb, 0,
                                    &cpi->fn_ptr[bsize], 1,
-                                   &ref_mv.as_mv, &tmp_mv->as_mv);
+                                   &ref_mv, &tmp_mv->as_mv);
    } else if (cpi->sf.search_method == HEX) {
 +    // NOTE: this returns SAD
      bestsme = vp9_hex_search(x, &mvp_full, step_param, sadpb, 1,
                               &cpi->fn_ptr[bsize], 1,
-                              &ref_mv.as_mv, &tmp_mv->as_mv);
+                              &ref_mv, &tmp_mv->as_mv);
    } else if (cpi->sf.search_method == SQUARE) {
 +    // NOTE: this returns SAD
      bestsme = vp9_square_search(x, &mvp_full, step_param, sadpb, 1,
                                  &cpi->fn_ptr[bsize], 1,
-                                 &ref_mv.as_mv, &tmp_mv->as_mv);
+                                 &ref_mv, &tmp_mv->as_mv);
    } else if (cpi->sf.search_method == BIGDIA) {
 +    // NOTE: this returns SAD
      bestsme = vp9_bigdia_search(x, &mvp_full, step_param, sadpb, 1,
                                  &cpi->fn_ptr[bsize], 1,
-                                 &ref_mv.as_mv, &tmp_mv->as_mv);
+                                 &ref_mv, &tmp_mv->as_mv);
    } else {
 +    int further_steps = (cpi->sf.max_step_search_steps - 1) - step_param;
 +    // NOTE: this returns variance
      bestsme = vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param,
                                       sadpb, further_steps, 1,
                                       &cpi->fn_ptr[bsize],