commit dd28aed875d24a27ef13a0167eff1584193007df
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 6a596894da15d13d34907bee278db3db9b6a41d2
parent 10ba2bedf0d32d94e896794681ceffad3c730709

Use uv_mode_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I0cacd4e8cdd07458b36bbdd56e4f005327854b34

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 54ffa05..bad72db 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1772,13 +1772,11 @@
 #if CONFIG_LOOP_RESTORATION
   av1_copy(fc->switchable_restore_prob, default_switchable_restore_prob);
 #endif  // CONFIG_LOOP_RESTORATION
-#if CONFIG_DAALA_EC
-  av1_tree_to_cdf_1D(av1_intra_mode_tree, fc->uv_mode_prob, fc->uv_mode_cdf,
-                     INTRA_MODES);
-#endif
 #if CONFIG_EC_MULTISYMBOL
   av1_tree_to_cdf_1D(av1_intra_mode_tree, fc->y_mode_prob, fc->y_mode_cdf,
                      BLOCK_SIZE_GROUPS);
+  av1_tree_to_cdf_1D(av1_intra_mode_tree, fc->uv_mode_prob, fc->uv_mode_cdf,
+                     INTRA_MODES);
   av1_tree_to_cdf_1D(av1_switchable_interp_tree, fc->switchable_interp_prob,
                      fc->switchable_interp_cdf, SWITCHABLE_FILTER_CONTEXTS);
   av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf,
@@ -1812,6 +1810,10 @@
                     cm->fc->seg.tree_cdf);
   }
 
+  for (i = 0; i < INTRA_MODES; ++i)
+    av1_tree_to_cdf(av1_intra_mode_tree, fc->uv_mode_prob[i],
+                    fc->uv_mode_cdf[i]);
+
   for (i = 0; i < PARTITION_CONTEXTS; ++i)
     av1_tree_to_cdf(av1_partition_tree, fc->partition_prob[i],
                     fc->partition_cdf[i]);
@@ -1842,12 +1844,6 @@
     av1_tree_to_cdf(av1_ext_tx_tree, fc->inter_ext_tx_prob[i],
                     fc->inter_ext_tx_cdf[i]);
 #endif
-#if CONFIG_DAALA_EC
-  for (i = 0; i < INTRA_MODES; ++i)
-    av1_tree_to_cdf(av1_intra_mode_tree, fc->uv_mode_prob[i],
-                    fc->uv_mode_cdf[i]);
-
-#endif
 }
 #endif
 

av1/common/entropymode.h

diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 13fa0a9..c85010c 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -165,11 +165,9 @@
 #if CONFIG_LOOP_RESTORATION
   aom_prob switchable_restore_prob[RESTORE_SWITCHABLE_TYPES - 1];
 #endif  // CONFIG_LOOP_RESTORATION
-#if CONFIG_DAALA_EC
-  aom_cdf_prob uv_mode_cdf[INTRA_MODES][INTRA_MODES];
-#endif
 #if CONFIG_EC_MULTISYMBOL
   aom_cdf_prob y_mode_cdf[BLOCK_SIZE_GROUPS][INTRA_MODES];
+  aom_cdf_prob uv_mode_cdf[INTRA_MODES][INTRA_MODES];
   aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][PARTITION_TYPES];
   aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
                                     [SWITCHABLE_FILTERS];