From: Angie Chiang <angiebird@google.com>
Date: Wed, 26 Jun 2019 22:46:43 +0000 (-0700)
Subject: Refactor vp9_full_pixel_diamond_new
X-Git-Tag: v1.8.2~178^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=295fd37912bad715be46b7b2789dbbf1bacb3523;p=libvpx

Refactor vp9_full_pixel_diamond_new

Remove redundant bestsme assignments

Change-Id: I565f477f51c2a13369ebd1532eed05115e774238
---

diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index d1688f993..81aab0fb4 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -2602,9 +2602,8 @@ double vp9_full_pixel_diamond_new(const VP9_COMP *cpi, MACROBLOCK *x,
   const int further_steps = MAX_MVSEARCH_STEPS - 1 - step_param;
   const MV center_mv = { 0, 0 };
   vpx_clear_system_state();
-  bestsme =
-      diamond_search_sad_new(x, &cpi->ss_cfg, mvp_full, best_mv, step_param,
-                             lambda, &n, fn_ptr, nb_full_mvs, full_mv_num);
+  diamond_search_sad_new(x, &cpi->ss_cfg, mvp_full, best_mv, step_param, lambda,
+                         &n, fn_ptr, nb_full_mvs, full_mv_num);
 
   bestsme = vp9_get_mvpred_var(x, best_mv, &center_mv, fn_ptr, 0);
 
@@ -2618,9 +2617,9 @@ double vp9_full_pixel_diamond_new(const VP9_COMP *cpi, MACROBLOCK *x,
       num00--;
     } else {
       MV temp_mv;
-      thissme = diamond_search_sad_new(x, &cpi->ss_cfg, mvp_full, &temp_mv,
-                                       step_param + n, lambda, &num00, fn_ptr,
-                                       nb_full_mvs, full_mv_num);
+      diamond_search_sad_new(x, &cpi->ss_cfg, mvp_full, &temp_mv,
+                             step_param + n, lambda, &num00, fn_ptr,
+                             nb_full_mvs, full_mv_num);
       thissme = vp9_get_mvpred_var(x, &temp_mv, &center_mv, fn_ptr, 0);
       // check to see if refining search is needed.
       if (num00 > further_steps - n) do_refine = 0;
@@ -2636,8 +2635,8 @@ double vp9_full_pixel_diamond_new(const VP9_COMP *cpi, MACROBLOCK *x,
   if (do_refine) {
     const int search_range = 8;
     MV temp_mv = *best_mv;
-    thissme = vp9_refining_search_sad_new(x, &temp_mv, lambda, search_range,
-                                          fn_ptr, nb_full_mvs, full_mv_num);
+    vp9_refining_search_sad_new(x, &temp_mv, lambda, search_range, fn_ptr,
+                                nb_full_mvs, full_mv_num);
     thissme = vp9_get_mvpred_var(x, &temp_mv, &center_mv, fn_ptr, 0);
     if (thissme < bestsme) {
       bestsme = thissme;