commit 00b3331ee8db2bbb015ff54a76fe28cb53617802
author Nathan E. Egge <negge@mozilla.com> Wed Nov 16 09:44:26 2016 -0500
committer Nathan Egge <negge@mozilla.com> Thu Jan 05 08:26:14 2017 +0000
tree d04d94c9ef827716393612cca3e3254a47fe47c9
parent 29ccee03c00bc1e3d15e9808909309de77939d72

Use switchable_interp_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I3f7eeff102fc30e2cef59c2c07df94826587d100

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 5a082c0..0363ea2 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1082,7 +1082,7 @@
       if (has_subpel_mv_component(xd->mi[0], xd, dir) ||
           (mbmi->ref_frame[1] > INTRA_FRAME &&
            has_subpel_mv_component(xd->mi[0], xd, dir + 2))) {
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
         mbmi->interp_filter[dir] =
             (InterpFilter)av1_switchable_interp_inv[aom_read_symbol(
                 r, cm->fc->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS,
@@ -1112,7 +1112,7 @@
     mbmi->interp_filter = cm->interp_filter;
   } else {
     const int ctx = av1_get_pred_context_switchable_interp(xd);
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
     mbmi->interp_filter =
         (InterpFilter)av1_switchable_interp_inv[aom_read_symbol(
             r, cm->fc->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS,

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index f497f16..a421ec1 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -51,14 +51,14 @@
 #endif  // CONFIG_EXT_INTER
     init_done = 1;
 #if CONFIG_DAALA_EC
-    av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv,
-                          SWITCHABLE_FILTERS, av1_switchable_interp_tree);
     av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES,
                           av1_intra_mode_tree);
     av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
                           av1_inter_mode_tree);
 #endif
 #if CONFIG_EC_MULTISYMBOL
+    av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv,
+                          SWITCHABLE_FILTERS, av1_switchable_interp_tree);
 #if !CONFIG_EXT_TX
     av1_indices_from_tree(av1_ext_tx_ind, av1_ext_tx_inv, TX_TYPES,
                           av1_ext_tx_tree);