commit d58f37783c5f8873b65bf3c50fa5022799e9ea4f
author Jingning Han <jingning@google.com> Thu Dec 05 15:52:36 2019 -0800
committer Jingning Han <jingning@google.com> Sat Dec 07 00:01:30 2019 +0000
tree ec48ade713b58bff8d87b9fd628c32356db33f07
parent d674c42a40786b4f21f04bc3d9b08287753d9da6

Unify motion estimation process

Unify the motion estimation process used in first and second pass
encoding paths.

Change-Id: I486c3be695fb8ce7c7a204767868a22cd735f65e

av1/encoder/mcomp.h

diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index c19ecfa..0104b8d 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -66,7 +66,7 @@
 // Utility to compute variance + MV rate cost for a given MV
 int av1_get_mvpred_var(const MACROBLOCK *x, const MV *best_mv,
                        const MV *center_mv, const aom_variance_fn_ptr_t *vfp,
-                       int use_mvcost);
+                       int use_var);
 int av1_get_mvpred_av_var(const MACROBLOCK *x, const MV *best_mv,
                           const MV *center_mv, const uint8_t *second_pred,
                           const aom_variance_fn_ptr_t *vfp,
@@ -135,9 +135,9 @@
 
 int av1_full_pixel_search(const struct AV1_COMP *cpi, MACROBLOCK *x,
                           BLOCK_SIZE bsize, MV *mvp_full, int step_param,
-                          int method, int run_mesh_search, int error_per_bit,
-                          int *cost_list, const MV *ref_mv, int var_max, int rd,
-                          int x_pos, int y_pos, int intra,
+                          int use_var, int method, int run_mesh_search,
+                          int error_per_bit, int *cost_list, const MV *ref_mv,
+                          int var_max, int rd, int x_pos, int y_pos, int intra,
                           const search_site_config *cfg,
                           int use_intrabc_mesh_pattern);