commit ec92c113c3535e4067703462c422a9c8ac1231f7
author Thomas Davies <thdavies@cisco.com> Mon Sep 25 11:03:58 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Thu Sep 28 06:16:29 2017 +0000
tree d4e7dfbc6f72ce643a701dc6a6fecf425fc4df8f
parent 4ce85214a52c3966a04a6e3bdf9d8c91dc427606

Remove unused switchable filter probs and remove remapping.

CDFs are used for coding and costs, so there is no need to
base the CDF on the obsolete tree and remap filter indices.

No change to common test conditions BDR.

Change-Id: I441dd21b127bc07ba33eef8ddcfd147eef21d0d4

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e896796..5e07df3 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1732,9 +1732,8 @@
           (mbmi->ref_frame[1] > INTRA_FRAME &&
            has_subpel_mv_component(xd->mi[0], xd, dir + 2))) {
         mbmi->interp_filter[dir] =
-            (InterpFilter)av1_switchable_interp_inv[aom_read_symbol(
-                r, ec_ctx->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS,
-                ACCT_STR)];
+            (InterpFilter)aom_read_symbol(r, ec_ctx->switchable_interp_cdf[ctx],
+                                          SWITCHABLE_FILTERS, ACCT_STR);
         if (counts) ++counts->switchable_interp[ctx][mbmi->interp_filter[dir]];
       }
     }
@@ -1749,10 +1748,8 @@
     mbmi->interp_filter = cm->interp_filter;
   } else {
     const int ctx = av1_get_pred_context_switchable_interp(xd);
-    mbmi->interp_filter =
-        (InterpFilter)av1_switchable_interp_inv[aom_read_symbol(
-            r, ec_ctx->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS,
-            ACCT_STR)];
+    mbmi->interp_filter = (InterpFilter)aom_read_symbol(
+        r, ec_ctx->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS, ACCT_STR);
     if (counts) ++counts->switchable_interp[ctx][mbmi->interp_filter];
   }
 #endif  // CONFIG_DUAL_FILTER

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index 6ee00f3..b4a83c9 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -52,8 +52,6 @@
     av1_init_wedge_masks();
 #endif  // CONFIG_EXT_INTER
     init_done = 1;
-    av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv,
-                          av1_switchable_interp_tree);
 #if CONFIG_EXT_TX
     for (int s = 1; s < EXT_TX_SET_TYPES; ++s) {
       av1_indices_from_tree(av1_ext_tx_ind[s], av1_ext_tx_inv[s],