commit eff7d307987f042f6171ba83495a4213c0a99600
author Yue Chen <yuec@google.com> Thu Mar 28 11:14:14 2019 -0700
committer Yue Chen <yuec@google.com> Thu Mar 28 18:58:58 2019 +0000
tree 94f86464b0c5076b6434a4f70a1841b0565ce0f8
parent 13cccf2db1b0e576127b06a5a7e71922535b167e

Remove unused parameters in tpl experiment

Change-Id: I3336aff07a85b85e0fc1ed479de0e33355139f92

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 6c0278e..2952184 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4301,7 +4301,6 @@
   int row, col;
 
   int dr = 0;
-  int count = 0;
   double r0, rk, beta;
 
   if (tpl_frame->is_valid == 0) return orig_rdmult;
@@ -4318,8 +4317,6 @@
 
       intra_cost += this_stats->intra_cost;
       mc_dep_cost += this_stats->mc_dep_cost;
-
-      ++count;
     }
   }
 

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index cbb8462..79afb6d 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -119,7 +119,6 @@
                             tran_low_t *qcoeff, tran_low_t *dqcoeff, int mi_row,
                             int mi_col, BLOCK_SIZE bsize, TX_SIZE tx_size,
                             YV12_BUFFER_CONFIG *ref_frame[], uint8_t *predictor,
-                            int64_t *recon_error, int64_t *sse,
                             TplDepStats *tpl_stats) {
   AV1_COMMON *cm = &cpi->common;
   ThreadData *td = &cpi->td;
@@ -223,11 +222,13 @@
 
     inter_cost = aom_satd(coeff, pix_num);
     if (inter_cost < best_inter_cost) {
+      int64_t recon_error, sse;
+
       best_rf_idx = rf_idx;
       best_inter_cost = inter_cost;
       best_mv.as_int = x->best_mv.as_int;
-      get_quantize_error(x, 0, coeff, qcoeff, dqcoeff, tx_size, recon_error,
-                         sse);
+      get_quantize_error(x, 0, coeff, qcoeff, dqcoeff, tx_size, &recon_error,
+                         &sse);
     }
   }
   best_intra_cost = AOMMAX(best_intra_cost, 1);
@@ -404,7 +405,6 @@
   const TX_SIZE tx_size = max_txsize_lookup[bsize];
   const int mi_height = mi_size_high[bsize];
   const int mi_width = mi_size_wide[bsize];
-  int64_t recon_error, sse;
 
   // Setup scaling factor
   av1_setup_scale_factors_for_frame(
@@ -430,8 +430,8 @@
   // Get rd multiplier set up.
   rdmult = (int)av1_compute_rd_mult(cpi, tpl_frame->base_qindex);
   if (rdmult < 1) rdmult = 1;
-  set_error_per_bit(&cpi->td.mb, rdmult);
-  av1_initialize_me_consts(cpi, &cpi->td.mb, tpl_frame->base_qindex);
+  set_error_per_bit(x, rdmult);
+  av1_initialize_me_consts(cpi, x, tpl_frame->base_qindex);
 
   tpl_frame->is_valid = 1;
 
@@ -447,7 +447,7 @@
       TplDepStats tpl_stats;
       mode_estimation(cpi, x, xd, &sf, gf_picture, frame_idx, src_diff, coeff,
                       qcoeff, dqcoeff, mi_row, mi_col, bsize, tx_size,
-                      ref_frame, predictor, &recon_error, &sse, &tpl_stats);
+                      ref_frame, predictor, &tpl_stats);
 
       // Motion flow dependency dispenser.
       tpl_model_store(tpl_frame->tpl_stats_ptr, mi_row, mi_col, bsize,