commit bc732efc4164fe3928d16fddbedf530bacc358e0
author Debargha Mukherjee <debargha@google.com> Thu Oct 12 12:40:25 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Fri Oct 13 08:54:40 2017 +0000
tree b1dd19fc61b6bc7794ab1d7b9cb79740fb0f3057
parent fc0eeb33354dffe41d8831e9f632798bb0ed60f2

Use cdfs for loop-restoration types

BUG=aomedia:907

Change-Id: I30a0290e499d338250343b5f9092bdcabe7d867a

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 6a3df8d..e2db714 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2492,15 +2492,20 @@
 #endif
 
 #if CONFIG_LOOP_RESTORATION
-const aom_tree_index
-    av1_switchable_restore_tree[TREE_SIZE(RESTORE_SWITCHABLE_TYPES)] = {
-      -RESTORE_NONE, 2, -RESTORE_WIENER, -RESTORE_SGRPROJ,
+static const aom_cdf_prob
+    default_switchable_restore_cdf[CDF_SIZE(RESTORE_SWITCHABLE_TYPES)] = {
+      AOM_ICDF(32 * 128), AOM_ICDF(144 * 128), AOM_ICDF(32768), 0,
     };
 
-static const aom_prob
-    default_switchable_restore_prob[RESTORE_SWITCHABLE_TYPES - 1] = {
-      32, 128,
-    };
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob default_wiener_restore_cdf[CDF_SIZE(2)] = {
+  AOM_ICDF(64 * 128), AOM_ICDF(32768), 0,
+};
+
+static const aom_cdf_prob default_sgrproj_restore_cdf[CDF_SIZE(2)] = {
+  AOM_ICDF(64 * 128), AOM_ICDF(32768), 0,
+};
+#endif  // CONFIG_NEW_MULTISYMBOL
 #endif  // CONFIG_LOOP_RESTORATION
 
 #define NUM_PALETTE_NEIGHBORS 3  // left, top-left and top.
@@ -6644,7 +6649,11 @@
   av1_copy(fc->inter_lgt_prob, default_inter_lgt_prob);
 #endif  // CONFIG_LGT_FROM_PRED
 #if CONFIG_LOOP_RESTORATION
-  av1_copy(fc->switchable_restore_prob, default_switchable_restore_prob);
+  av1_copy(fc->switchable_restore_cdf, default_switchable_restore_cdf);
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->wiener_restore_cdf, default_wiener_restore_cdf);
+  av1_copy(fc->sgrproj_restore_cdf, default_sgrproj_restore_cdf);
+#endif  // CONFIG_NEW_MULTISYMBOL
 #endif  // CONFIG_LOOP_RESTORATION
   av1_copy(fc->y_mode_cdf, default_if_y_mode_cdf);
   av1_copy(fc->uv_mode_cdf, default_uv_mode_cdf);