Costing fixes related to trellis optimization

Migrates costing changes/fixes from the rebalance expt to the head
without the expt on.

Rebased.

Change-Id: I51677d62f77ed08aca8d21a4c9a13103eb8de93f
Results:
derfraw300: +0.126%

3 files changed, 4 insertions, 65 deletions

diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h
index e6d36cdf8..e78f54eb4 100644
--- a/vp9/encoder/vp9_block.h
+++ b/vp9/encoder/vp9_block.h
@@ -135,9 +135,7 @@ struct macroblock {
 
   // note that token_costs is the cost when eob node is skipped
   vp9_coeff_count token_costs[TX_SIZE_MAX_SB][BLOCK_TYPES];
-#if CONFIG_BALANCED_COEFTREE
   vp9_coeff_count token_costs_noskip[TX_SIZE_MAX_SB][BLOCK_TYPES];
-#endif
 
   int optimize;
 
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index 98ea98031..d54594f07 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -215,21 +215,12 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
         band = get_coef_band(band_translate, i + 1);
         pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache,
                                        pad, default_eob);
-#if CONFIG_BALANCED_COEFTREE
         rate0 +=
           mb->token_costs_noskip[tx_size][type][ref][band][pt]
                                 [tokens[next][0].token];
         rate1 +=
           mb->token_costs_noskip[tx_size][type][ref][band][pt]
                                 [tokens[next][1].token];
-#else
-        rate0 +=
-          mb->token_costs[tx_size][type][ref][band][pt]
-                         [tokens[next][0].token];
-        rate1 +=
-          mb->token_costs[tx_size][type][ref][band][pt]
-                         [tokens[next][1].token];
-#endif
       }
       UPDATE_RD_COST();
       /* And pick the best. */
@@ -277,32 +268,22 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
         if (t0 != DCT_EOB_TOKEN) {
           pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache,
                                          pad, default_eob);
-#if CONFIG_BALANCED_COEFTREE
           if (!x)
             rate0 += mb->token_costs[tx_size][type][ref][band][pt][
                 tokens[next][0].token];
           else
             rate0 += mb->token_costs_noskip[tx_size][type][ref][band][pt][
                 tokens[next][0].token];
-#else
-          rate0 += mb->token_costs[tx_size][type][ref][band][pt][
-              tokens[next][0].token];
-#endif
         }
         if (t1 != DCT_EOB_TOKEN) {
           pt = trellis_get_coeff_context(scan, nb, i, t1, token_cache,
                                          pad, default_eob);
-#if CONFIG_BALANCED_COEFTREE
           if (!x)
             rate1 += mb->token_costs[tx_size][type][ref][band][pt][
                 tokens[next][1].token];
           else
             rate1 += mb->token_costs_noskip[tx_size][type][ref][band][pt][
                 tokens[next][1].token];
-#else
-          rate1 += mb->token_costs[tx_size][type][ref][band][pt][
-              tokens[next][1].token];
-#endif
         }
       }
 
@@ -355,13 +336,8 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
   error1 = tokens[next][1].error;
   t0 = tokens[next][0].token;
   t1 = tokens[next][1].token;
-#if CONFIG_BALANCED_COEFTREE
   rate0 += mb->token_costs_noskip[tx_size][type][ref][band][pt][t0];
   rate1 += mb->token_costs_noskip[tx_size][type][ref][band][pt][t1];
-#else
-  rate0 += mb->token_costs[tx_size][type][ref][band][pt][t0];
-  rate1 += mb->token_costs[tx_size][type][ref][band][pt][t1];
-#endif
   UPDATE_RD_COST();
   best = rd_cost1 < rd_cost0;
   final_eob = i0 - 1;
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 3b66773aa..849d17bc5 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -111,7 +111,6 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = {
   {SPLITMV,   GOLDEN_FRAME, ALTREF_FRAME},
 };
 
-#if CONFIG_BALANCED_COEFTREE
 static void fill_token_costs(vp9_coeff_count (*c)[BLOCK_TYPES],
                              vp9_coeff_count (*cnoskip)[BLOCK_TYPES],
                              vp9_coeff_probs_model (*p)[BLOCK_TYPES]) {
@@ -126,29 +125,19 @@ static void fill_token_costs(vp9_coeff_count (*c)[BLOCK_TYPES],
             vp9_model_to_full_probs(p[t][i][j][k][l], probs);
             vp9_cost_tokens((int *)cnoskip[t][i][j][k][l], probs,
                             vp9_coef_tree);
+#if CONFIG_BALANCED_COEFTREE
             // Replace the eob node prob with a very small value so that the
             // cost approximately equals the cost without the eob node
             probs[1] = 1;
             vp9_cost_tokens((int *)c[t][i][j][k][l], probs, vp9_coef_tree);
-          }
-}
 #else
-static void fill_token_costs(vp9_coeff_count (*c)[BLOCK_TYPES],
-                             vp9_coeff_probs_model (*p)[BLOCK_TYPES]) {
-  int i, j, k, l;
-  TX_SIZE t;
-  for (t = TX_4X4; t <= TX_32X32; t++)
-    for (i = 0; i < BLOCK_TYPES; i++)
-      for (j = 0; j < REF_TYPES; j++)
-        for (k = 0; k < COEF_BANDS; k++)
-          for (l = 0; l < PREV_COEF_CONTEXTS; l++) {
-            vp9_prob probs[ENTROPY_NODES];
-            vp9_model_to_full_probs(p[t][i][j][k][l], probs);
             vp9_cost_tokens_skip((int *)c[t][i][j][k][l], probs,
                                  vp9_coef_tree);
+            assert(c[t][i][j][k][l][DCT_EOB_TOKEN] ==
+                   cnoskip[t][i][j][k][l][DCT_EOB_TOKEN]);
+#endif
           }
 }
-#endif
 
 static int rd_iifactor[32] =  { 4, 4, 3, 2, 1, 0, 0, 0,
                                 0, 0, 0, 0, 0, 0, 0, 0,
@@ -239,14 +228,9 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
     }
   }
 
-#if CONFIG_BALANCED_COEFTREE
   fill_token_costs(cpi->mb.token_costs,
                    cpi->mb.token_costs_noskip,
                    cpi->common.fc.coef_probs);
-#else
-  fill_token_costs(cpi->mb.token_costs,
-                   cpi->common.fc.coef_probs);
-#endif
 
   for (i = 0; i < NUM_PARTITION_CONTEXTS; i++)
     vp9_cost_tokens(cpi->mb.partition_cost[i],
@@ -299,12 +283,8 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
   TX_TYPE tx_type = DCT_DCT;
 
   const int segment_id = xd->mode_info_context->mbmi.segment_id;
-#if CONFIG_BALANCED_COEFTREE
   unsigned int (*token_costs_noskip)[PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS] =
       mb->token_costs_noskip[tx_size][type][ref];
-#else
-  vp9_prob coef_probs[COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES];
-#endif
 
   int seg_eob, default_eob;
   uint8_t token_cache[1024];
@@ -319,9 +299,6 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
     assert(tx_size == tx_size_uv);
   }
 
-#if !CONFIG_BALANCED_COEFTREE
-  vp9_model_to_full_probs_sb(cm->fc.coef_probs[tx_size][type][ref], coef_probs);
-#endif
   switch (tx_size) {
     case TX_4X4: {
       tx_type = (type == PLANE_TYPE_Y_WITH_DC) ?
@@ -391,30 +368,18 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
       if (c)
         pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob);
 
-#if CONFIG_BALANCED_COEFTREE
       if (!c || token_cache[scan[c - 1]])  // do not skip eob
         cost += token_costs_noskip[band][pt][t] + vp9_dct_value_cost_ptr[v];
       else
         cost += token_costs[band][pt][t] + vp9_dct_value_cost_ptr[v];
-#else
-      cost += token_costs[band][pt][t] + vp9_dct_value_cost_ptr[v];
-      if (!c || token_cache[scan[c - 1]])
-        cost += vp9_cost_bit(coef_probs[band][pt][0], 1);
-#endif
       token_cache[scan[c]] = vp9_pt_energy_class[t];
     }
     if (c < seg_eob) {
       if (c)
         pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob);
-#if CONFIG_BALANCED_COEFTREE
       cost += mb->token_costs_noskip[tx_size][type][ref]
           [get_coef_band(band_translate, c)]
           [pt][DCT_EOB_TOKEN];
-#else
-      cost += mb->token_costs[tx_size][type][ref]
-          [get_coef_band(band_translate, c)]
-          [pt][DCT_EOB_TOKEN];
-#endif
     }
   }