commit d85d94da063b97bbb353d758ff99558215b7d291
author Alex Converse <aconverse@google.com> Wed May 24 15:13:38 2017 -0700
committer Alex Converse <aconverse@google.com> Wed May 31 00:08:07 2017 +0000
tree c0c781b25f8a34ee80e516e42649f8cd34d19363
parent 723923ca57ab49552a311b4c98d1fb2278f34884

Remove unused sadcost redirection pointers

Change-Id: Ib94d57b24d3276dd74abe151f740258d78ff430b

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index a674050..ac28fe2 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -142,12 +142,10 @@
   int *nmvcost[NMV_CONTEXTS][2];
   int *nmvcost_hp[NMV_CONTEXTS][2];
   int **mv_cost_stack[NMV_CONTEXTS];
-  int *nmvjointsadcost;
 
   int **mvcost;
   int *nmvsadcost[2];
   int *nmvsadcost_hp[2];
-  int **mvsadcost;
 #if CONFIG_MOTION_VAR
   int32_t *wsrc_buf;
   int32_t *mask_buf;

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 15ad823..6083155 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -250,13 +250,11 @@
     int i;
     for (i = 0; i < NMV_CONTEXTS; ++i) {
       mb->mv_cost_stack[i] = mb->nmvcost_hp[i];
-      mb->mvsadcost = mb->nmvsadcost_hp;
     }
   } else {
     int i;
     for (i = 0; i < NMV_CONTEXTS; ++i) {
       mb->mv_cost_stack[i] = mb->nmvcost[i];
-      mb->mvsadcost = mb->nmvsadcost;
     }
   }
 }

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index c4f475f..6d561f3 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -110,7 +110,7 @@
                           int sad_per_bit) {
   const MV diff = { (mv->row - ref->row) * 8, (mv->col - ref->col) * 8 };
   return ROUND_POWER_OF_TWO(
-      (unsigned)mv_cost(&diff, x->nmvjointsadcost, x->mvsadcost) * sad_per_bit,
+      (unsigned)mv_cost(&diff, x->nmvjointcost, x->mvcost) * sad_per_bit,
       AV1_PROB_COST_SHIFT);
 }
 

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 939abd7..54b845e 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -339,8 +339,6 @@
   (void)ref_frame;
   x->mvcost = x->mv_cost_stack[nmv_ctx];
   x->nmvjointcost = x->nmv_vec_cost[nmv_ctx];
-  x->mvsadcost = x->mvcost;
-  x->nmvjointsadcost = x->nmvjointcost;
 }
 
 void av1_initialize_rd_consts(AV1_COMP *cpi) {
@@ -368,8 +366,6 @@
   }
   x->mvcost = x->mv_cost_stack[0];
   x->nmvjointcost = x->nmv_vec_cost[0];
-  x->mvsadcost = x->mvcost;
-  x->nmvjointsadcost = x->nmvjointcost;
 
   if (cpi->oxcf.pass != 1) {
     av1_fill_token_costs(x->token_costs, cm->fc->coef_probs);

av1/encoder/temporal_filter.c

diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 7508de8..1ed1ebd 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -283,10 +283,8 @@
 
   x->mvcost = x->mv_cost_stack[0];
   x->nmvjointcost = x->nmv_vec_cost[0];
-  x->mvsadcost = x->mvcost;
-  x->nmvjointsadcost = x->nmvjointcost;
 
-  // Ignore mv costing by sending NULL pointer instead of cost arrays
+  // Use mv costing from x->mvcost directly
   av1_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1,
                  cond_cost_list(cpi, cost_list), &cpi->fn_ptr[BLOCK_16X16], 0,
                  &best_ref_mv1);