commit 0c66adbd25a9b9c9b9c407d9002833b2f423949d
author chiyotsai <chiyotsai@google.com> Wed Apr 01 10:41:37 2020 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Wed Apr 01 21:03:43 2020 +0000
tree 639e50031213607b52651fcebc2743be54478235
parent 990b92059bc1d9c259922097fb0767d71e704272

Fix a valgrind error due to uninitialized memory

Change-Id: I990ea2aba98c4308323ad779b75765ec5ccc0e26

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index d2ca1cf..e4d9d6a 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2696,11 +2696,6 @@
   unsigned int besterr = INT_MAX;
   *bestmv = start_mv;
 
-  const int do_reset_fractional_mv = ms_params->do_reset_fractional_mv;
-  if (do_reset_fractional_mv && last_mv_search_list) {
-    av1_set_fractional_mv(last_mv_search_list);
-  }
-
   besterr = setup_center_error(xd, bestmv, var_params, mv_cost_params, sse1,
                                distortion);
   if (check_repeated_mv_and_update(last_mv_search_list, *bestmv, iter)) {
@@ -2805,7 +2800,6 @@
   const int allow_hp = ms_params->allow_hp;
   const int forced_stop = ms_params->forced_stop;
   const int iters_per_step = ms_params->iters_per_step;
-  const int do_reset_fractional_mv = ms_params->do_reset_fractional_mv;
   const MV_COST_PARAMS *mv_cost_params = &ms_params->mv_cost_params;
   const SUBPEL_SEARCH_VAR_PARAMS *var_params = &ms_params->var_params;
   const SUBPEL_SEARCH_TYPE subpel_search_type =
@@ -2829,10 +2823,6 @@
                                  distortion);
   }
 
-  if (do_reset_fractional_mv && last_mv_search_list) {
-    av1_set_fractional_mv(last_mv_search_list);
-  }
-
   for (int iter = 0; iter < round; ++iter) {
     MV iter_center_mv = *bestmv;
     if (check_repeated_mv_and_update(last_mv_search_list, iter_center_mv,
@@ -3305,7 +3295,6 @@
   const int allow_hp = ms_params->allow_hp;
   const int forced_stop = ms_params->forced_stop;
   const int iters_per_step = ms_params->iters_per_step;
-  // const int do_reset_fractional_mv = ms_params->do_reset_fractional_mv;
   const MV_COST_PARAMS *mv_cost_params = &ms_params->mv_cost_params;
   const SUBPEL_SEARCH_VAR_PARAMS *var_params = &ms_params->var_params;
   const SUBPEL_SEARCH_TYPE subpel_search_type =

av1/encoder/mcomp.h

diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index 4887bca..4e24aeb 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -262,7 +262,6 @@
   const int *cost_list;
   SUBPEL_FORCE_STOP forced_stop;
   int iters_per_step;
-  int do_reset_fractional_mv;
   SubpelMvLimits mv_limits;
 
   // For calculating mv cost