commit 476c63c1ddd27c7a0da2246c0373d07ff14fc2af
author Nathan E. Egge <negge@mozilla.com> Thu May 18 18:35:16 2017 -0400
committer Nathan Egge <negge@mozilla.com> Thu May 25 18:31:31 2017 +0000
tree 0fabc61d52f49ba544b87f6212a180173f799d87
parent c747a78ea964eb6510dea876e8667b6c239feb0f

Remove the DAALA_EC experiment.

This patch forces DAALA_EC on by default and removes the dkbool coder.

Change-Id: Icd2ff08efd7bf467adf554344111473cb357adf8

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index b4d19ff..4199906 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -128,12 +128,8 @@
 static INLINE unsigned int get_token_bit_costs(
     unsigned int token_costs[2][COEFF_CONTEXTS][ENTROPY_TOKENS], int skip_eob,
     int ctx, int token) {
-#if CONFIG_DAALA_EC || CONFIG_ANS
   (void)skip_eob;
   return token_costs[token == ZERO_TOKEN || token == EOB_TOKEN][ctx][token];
-#else
-  return token_costs[skip_eob][ctx][token];
-#endif  // CONFIG_DAALA_EC || CONFIG_ANS
 }
 
 #define USE_GREEDY_OPTIMIZE_B 0
@@ -2039,10 +2035,10 @@
 
   *eob = 0;
 
-#if CONFIG_DAALA_EC
+#if !CONFIG_ANS
   tell = od_ec_enc_tell_frac(&daala_enc->w.ec);
 #else
-#error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
+#error "CONFIG_PVQ currently requires !CONFIG_ANS."
 #endif
 
   // Change coefficient ordering for pvq encoding.
@@ -2111,11 +2107,11 @@
 
   *eob = tx_blk_size * tx_blk_size;
 
-#if CONFIG_DAALA_EC
+#if !CONFIG_ANS
   *rate = (od_ec_enc_tell_frac(&daala_enc->w.ec) - tell)
           << (AV1_PROB_COST_SHIFT - OD_BITRES);
 #else
-#error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
+#error "CONFIG_PVQ currently requires !CONFIG_ANS."
 #endif
   assert(*rate >= 0);