Make pattern search return var instead of sad
This makes its behavior consistent with that of full_pixel_diamond.
STATS_CHANGED
BUG=aomedia:2594
Change-Id: I37226d7cd9f2b0f959b77eb107f6255d67ed4023
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index e56030d..41e24ef 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -731,9 +731,12 @@
calc_int_cost_list(x, ref_mv, vfp, &full_best_mv, cost_list);
}
}
- x->best_mv.as_mv.row = br;
- x->best_mv.as_mv.col = bc;
- return bestsad;
+ x->best_mv.as_fullmv.row = br;
+ x->best_mv.as_fullmv.col = bc;
+
+ const int var_cost =
+ av1_get_mvpred_var(x, &x->best_mv.as_fullmv, ref_mv, vfp);
+ return var_cost;
}
#undef CHECK_BETTER