commit 1052575881bc5cfe9a48ed627a73e6fb756997d7
author Thomas Davies <thdavies@cisco.com> Mon Mar 06 12:10:46 2017 +0000
committer Thomas Davies <thdavies@cisco.com> Wed Mar 15 09:32:45 2017 +0000
tree eae62e7c31b61bc77962ee1f0d2016ca8cfc7d63
parent 028b57f5634d110ca60c67921eb48ba701c8973a

NEW_TOKENSET: improve RDO.

Modify av1_coef_cost to reflect that EOB values are sent
with each non-zero coefficient, and modify chroma weight
to preserve original chroma balance.

AWCY, objective-1-fast, new_token+ec_adapt vs ec_multisymbol:

PSNR YCbCr:     -0.43%      -0.52%      -0.58%
PSNRHVS:        -0.81%
SSIM:           -0.73%
MSSSIM:         -0.93%
CIEDE2000:      -0.36%

This change:

PSNR YCbCr:     -0.15%      0.83%      0.77%
PSNRHVS:        -0.24%
SSIM:           -0.23%
MSSSIM:         -0.24%
CIEDE2000:       0.24%

Change-Id: I7f2dd9f3cd24bb64eb4131cba94dda466b9691b0

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 814ad74..38051cc 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -83,7 +83,11 @@
 
 // These numbers are empirically obtained.
 static const int plane_rd_mult[REF_TYPES][PLANE_TYPES] = {
+#if CONFIG_EC_ADAPT
+  { 10, 7 }, { 8, 5 },
+#else
   { 10, 6 }, { 8, 5 },
+#endif
 };
 
 #define UPDATE_RD_COST()                             \

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9b501a3..0aaaf68 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1116,6 +1116,7 @@
   const int ref = is_inter_block(mbmi);
   aom_prob *blockz_probs =
       cm->fc->blockzero_probs[txsize_sqr_map[tx_size]][type][ref];
+
 #endif  // CONFIG_NEW_TOKENSET
 
 #if CONFIG_AOM_HIGHBITDEPTH
@@ -1145,7 +1146,11 @@
       int v = qcoeff[0];
       int16_t prev_t;
       cost = av1_get_token_cost(v, &prev_t, cat6_high_cost);
+#if CONFIG_NEW_TOKENSET
+      cost += (*token_costs)[!prev_t][pt][prev_t];
+#else
       cost += (*token_costs)[0][pt][prev_t];
+#endif
 
       token_cache[0] = av1_pt_energy_class[prev_t];
       ++token_costs;
@@ -1157,7 +1162,11 @@
 
         v = qcoeff[rc];
         cost += av1_get_token_cost(v, &t, cat6_high_cost);
+#if CONFIG_NEW_TOKENSET
+        cost += (*token_costs)[!t][!prev_t][t];
+#else
         cost += (*token_costs)[!prev_t][!prev_t][t];
+#endif
         prev_t = t;
         if (!--band_left) {
           band_left = *band_count++;
@@ -1166,7 +1175,8 @@
       }
 
       // eob token
-      if (band_left) cost += (*token_costs)[0][!prev_t][EOB_TOKEN];
+      if (band_left || CONFIG_NEW_TOKENSET)
+        cost += (*token_costs)[0][!prev_t][EOB_TOKEN];
 
     } else {  // !use_fast_coef_costing
       int band_left = *band_count++;
@@ -1174,14 +1184,22 @@
       // dc token
       int v = qcoeff[0];
       int16_t tok;
+#if !CONFIG_NEW_TOKENSET
       unsigned int(*tok_cost_ptr)[COEFF_CONTEXTS][ENTROPY_TOKENS];
+#endif
       cost = av1_get_token_cost(v, &tok, cat6_high_cost);
+#if CONFIG_NEW_TOKENSET
+      cost += (*token_costs)[!tok][pt][tok];
+#else
       cost += (*token_costs)[0][pt][tok];
+#endif
 
       token_cache[0] = av1_pt_energy_class[tok];
       ++token_costs;
 
+#if !CONFIG_NEW_TOKENSET
       tok_cost_ptr = &((*token_costs)[!tok]);
+#endif
 
       // ac tokens
       for (c = 1; c < eob; c++) {
@@ -1190,17 +1208,23 @@
         v = qcoeff[rc];
         cost += av1_get_token_cost(v, &tok, cat6_high_cost);
         pt = get_coef_context(nb, token_cache, c);
+#if CONFIG_NEW_TOKENSET
+        cost += (*token_costs)[!tok][pt][tok];
+#else
         cost += (*tok_cost_ptr)[pt][tok];
+#endif
         token_cache[rc] = av1_pt_energy_class[tok];
         if (!--band_left) {
           band_left = *band_count++;
           ++token_costs;
         }
+#if !CONFIG_NEW_TOKENSET
         tok_cost_ptr = &((*token_costs)[!tok]);
+#endif
       }
 
       // eob token
-      if (band_left) {
+      if (band_left || CONFIG_NEW_TOKENSET) {
         pt = get_coef_context(nb, token_cache, c);
         cost += (*token_costs)[0][pt][EOB_TOKEN];
       }