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/encodemv.c

diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index 3a2ea78..eb0ff88 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -45,13 +45,8 @@
   // Sign
   aom_write(w, sign, mvcomp->sign);
 
-// Class
-#if CONFIG_DAALA_EC || CONFIG_ANS
+  // Class
   aom_write_symbol(w, mv_class, mvcomp->class_cdf, MV_CLASSES);
-#else
-  av1_write_token(w, av1_mv_class_tree, mvcomp->classes,
-                  &mv_class_encodings[mv_class]);
-#endif
 
   // Integer bits
   if (mv_class == MV_CLASS_0) {
@@ -62,16 +57,10 @@
     for (i = 0; i < n; ++i) aom_write(w, (d >> i) & 1, mvcomp->bits[i]);
   }
 
-// Fractional bits
-#if CONFIG_DAALA_EC || CONFIG_ANS
+  // Fractional bits
   aom_write_symbol(
       w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
       MV_FP_SIZE);
-#else
-  av1_write_token(w, av1_mv_fp_tree,
-                  mv_class == MV_CLASS_0 ? mvcomp->class0_fp[d] : mvcomp->fp,
-                  &mv_fp_encodings[fr]);
-#endif
 
   // High precision bit
   if (usehp)
@@ -218,11 +207,7 @@
                    nmv_context *mvctx, int usehp) {
   const MV diff = { mv->row - ref->row, mv->col - ref->col };
   const MV_JOINT_TYPE j = av1_get_mv_joint(&diff);
-#if CONFIG_DAALA_EC || CONFIG_ANS
   aom_write_symbol(w, j, mvctx->joint_cdf, MV_JOINTS);
-#else
-  av1_write_token(w, av1_mv_joint_tree, mvctx->joints, &mv_joint_encodings[j]);
-#endif  // CONFIG_DAALA_EC || CONFIG_ANS
   if (mv_joint_vertical(j))
     encode_mv_component(w, diff.row, &mvctx->comps[0], usehp);
 
@@ -243,11 +228,7 @@
   const MV diff = { mv->row - ref->row, mv->col - ref->col };
   const MV_JOINT_TYPE j = av1_get_mv_joint(&diff);
 
-#if CONFIG_DAALA_EC || CONFIG_ANS
   aom_write_symbol(w, j, mvctx->joint_cdf, MV_JOINTS);
-#else
-  av1_write_token(w, av1_mv_joint_tree, mvctx->joints, &mv_joint_encodings[j]);
-#endif  // CONFIG_DAALA_EC || CONFIG_ANS
   if (mv_joint_vertical(j))
     encode_mv_component(w, diff.row, &mvctx->comps[0], 0);