commit 1e4e29f7760d14ae7f52ec869ba92587e742707c
author Alex Converse <aconverse@google.com> Tue Nov 08 14:12:14 2016 -0800
committer Alex Converse <aconverse@google.com> Wed Nov 09 01:25:29 2016 +0000
tree adcac8830af74043ea61558a349db938f1756c0b
parent e38d63c875003031f36fb9f9a781fa2f4e06632f

Fix rans ec_multisymbol merge issues.

The rans experiment is dead. The ans experiment with the ec_multisymbol
experiment also turned on takes its place.

Change-Id: Ie9f30ec7cf73aae6b2ea580a7b1f208485a8a7a7

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9111cb7..338b663 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1789,11 +1789,9 @@
   MODE_INFO *m;
   int plane;
   int bh, bw;
-#if CONFIG_RANS
-  (void)tok;
-  (void)tok_end;
-  (void)plane;
-#endif  // !CONFIG_RANS
+#if CONFIG_RD_DEBUG
+  int64_t txb_coeff_cost[MAX_MB_PLANE] = { 0 };
+#endif
 #if CONFIG_PVQ
   MB_MODE_INFO *mbmi;
   BLOCK_SIZE bsize;
@@ -2738,9 +2736,9 @@
   const TX_MODE tx_mode = cpi->common.tx_mode;
   const TX_SIZE max_tx_size = tx_mode_to_biggest_tx_size[tx_mode];
   TX_SIZE tx_size;
-#if CONFIG_RANS
+#if CONFIG_EC_MULTISYMBOL
   int update = 0;
-#endif  // CONFIG_RANS
+#endif  // CONFIG_EC_MULTISYMBOL
 #if CONFIG_ENTROPY
   AV1_COMMON *cm = &cpi->common;
   SUBFRAME_STATS *subframe_stats = &cpi->subframe_stats;
@@ -2788,18 +2786,18 @@
 
         update_coef_probs_subframe(w, cpi, tx_size, cpi->branch_ct_buf,
                                    frame_coef_probs);
-#if CONFIG_RANS
+#if CONFIG_EC_MULTISYMBOL
         update = 1;
-#endif  // CONFIG_RANS
+#endif  // CONFIG_EC_MULTISYMBOL
       } else {
 #endif  // CONFIG_ENTROPY
         build_tree_distribution(cpi, tx_size, frame_branch_ct,
                                 frame_coef_probs);
         update_coef_probs_common(w, cpi, tx_size, frame_branch_ct,
                                  frame_coef_probs);
-#if CONFIG_RANS
+#if CONFIG_EC_MULTISYMBOL
         update = 1;
-#endif  // CONFIG_RANS
+#endif  // CONFIG_EC_MULTISYMBOL
 #if CONFIG_ENTROPY
       }
 #endif  // CONFIG_ENTROPY
@@ -2826,9 +2824,9 @@
     av1_copy(cm->counts.eob_branch, eob_counts_copy);
   }
 #endif  // CONFIG_ENTROPY
-#if CONFIG_RANS
+#if CONFIG_EC_MULTISYMBOL
   if (update) av1_coef_pareto_cdfs(cpi->common.fc);
-#endif  // CONFIG_RANS
+#endif  // CONFIG_EC_MULTISYMBOL
 }
 #endif
 

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 5aafa79..73f63d3 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -306,12 +306,12 @@
 };
 #endif
 
-#if !CONFIG_RANS
+#if !CONFIG_EC_MULTISYMBOL
 const struct av1_token av1_coef_encodings[ENTROPY_TOKENS] = {
   { 2, 2 },  { 6, 3 },   { 28, 5 },  { 58, 6 },  { 59, 6 },  { 60, 6 },
   { 61, 6 }, { 124, 7 }, { 125, 7 }, { 126, 7 }, { 127, 7 }, { 0, 1 }
 };
-#endif  // !CONFIG_RANS
+#endif  // !CONFIG_EC_MULTISYMBOL
 
 struct tokenize_b_args {
   const AV1_COMP *cpi;

av1/encoder/tokenize.h

diff --git a/av1/encoder/tokenize.h b/av1/encoder/tokenize.h
index 27bdef5..e44bcc7 100644
--- a/av1/encoder/tokenize.h
+++ b/av1/encoder/tokenize.h
@@ -46,9 +46,9 @@
 
 extern const aom_tree_index av1_coef_tree[];
 extern const aom_tree_index av1_coef_con_tree[];
-#if !CONFIG_RANS
+#if !CONFIG_EC_MULTISYMBOL
 extern const struct av1_token av1_coef_encodings[];
-#endif  // !CONFIG_RANS
+#endif  // !CONFIG_EC_MULTISYMBOL
 
 int av1_is_skippable_in_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane);
 int av1_has_high_freq_in_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane);