commit 8e67c05f53f4a4273e7c58faeecb4d8aade0a00d
author Jingning Han <jingning@google.com> Thu Mar 23 15:47:33 2017 -0700
committer Jingning Han <jingning@google.com> Sat Mar 25 00:15:28 2017 +0000
tree 9be8d09b92ecaec81ed15e2887dd5b5df6249403
parent 9bc1d8de72a258725a3d5f2f1b51bf25fcc280f4

Fix tree to cdf index mapping

This fixes the mis-aligned cdf model derived from tree based
model. It resolves the compression performance regression in
dual filter, intra mode, inter mode, and transform block type
coding, when ec-multisymbol is enabled by default.

With dual filter enabled, the performance regression was 3.6%
loss for lowres. This fix brings the performance gains back to 1%
gains.

Change-Id: I80f5485386045908c152c9c11eeacbc650f1e324

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index 5a74a3b..1bd9108 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -51,23 +51,22 @@
 #endif  // CONFIG_EXT_INTER
     init_done = 1;
 #if CONFIG_EC_MULTISYMBOL
-    av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES,
+    av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv,
                           av1_intra_mode_tree);
     av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv,
-                          SWITCHABLE_FILTERS, av1_switchable_interp_tree);
+                          av1_switchable_interp_tree);
 #if CONFIG_EXT_TX
     int s;
     for (s = 1; s < EXT_TX_SETS_INTRA; ++s)
       av1_indices_from_tree(av1_ext_tx_intra_ind[s], av1_ext_tx_intra_inv[s],
-                            ext_tx_cnt_intra[s], av1_ext_tx_intra_tree[s]);
+                            av1_ext_tx_intra_tree[s]);
     for (s = 1; s < EXT_TX_SETS_INTER; ++s)
       av1_indices_from_tree(av1_ext_tx_inter_ind[s], av1_ext_tx_inter_inv[s],
-                            ext_tx_cnt_inter[s], av1_ext_tx_inter_tree[s]);
+                            av1_ext_tx_inter_tree[s]);
 #else
-    av1_indices_from_tree(av1_ext_tx_ind, av1_ext_tx_inv, TX_TYPES,
-                          av1_ext_tx_tree);
+    av1_indices_from_tree(av1_ext_tx_ind, av1_ext_tx_inv, av1_ext_tx_tree);
 #endif
-    av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
+    av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv,
                           av1_inter_mode_tree);
 #endif
   }