commit 10ba2bedf0d32d94e896794681ceffad3c730709
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 52ef795ebfe4c22765bb27ea786ee155eebadba5
parent ecc21ec8545023b19117a64a9699bb27c0fbc0e9

Use kf_y_mode_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: Ic0eba16329d7b63dd7d18e9cd28b89be4b5f2710

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index fa84b92..a6fa370 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -812,18 +812,19 @@
 #if CONFIG_CB4X4
   (void)i;
   mbmi->mode =
-#if CONFIG_DAALA_EC
-      read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
+#if CONFIG_EC_MULTISYMBOL
+      read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
 #else
       read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
-#endif  // CONFIG_DAALA_EC
+#endif
 #else
   switch (bsize) {
     case BLOCK_4X4:
       for (i = 0; i < 4; ++i)
         mi->bmi[i].as_mode =
-#if CONFIG_DAALA_EC
-            read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, i));
+#if CONFIG_EC_MULTISYMBOL
+            read_intra_mode_cdf(r,
+                                get_y_mode_cdf(cm, mi, above_mi, left_mi, i));
 #else
             read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, i));
 #endif
@@ -831,36 +832,36 @@
       break;
     case BLOCK_4X8:
       mi->bmi[0].as_mode = mi->bmi[2].as_mode =
-#if CONFIG_DAALA_EC
-          read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
+#if CONFIG_EC_MULTISYMBOL
+          read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
 #else
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
 #endif
       mi->bmi[1].as_mode = mi->bmi[3].as_mode = mbmi->mode =
-#if CONFIG_DAALA_EC
-          read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 1));
+#if CONFIG_EC_MULTISYMBOL
+          read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 1));
 #else
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 1));
 #endif
       break;
     case BLOCK_8X4:
       mi->bmi[0].as_mode = mi->bmi[1].as_mode =
-#if CONFIG_DAALA_EC
-          read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
+#if CONFIG_EC_MULTISYMBOL
+          read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
 #else
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
 #endif
       mi->bmi[2].as_mode = mi->bmi[3].as_mode = mbmi->mode =
-#if CONFIG_DAALA_EC
-          read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 2));
+#if CONFIG_EC_MULTISYMBOL
+          read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 2));
 #else
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 2));
 #endif
       break;
     default:
       mbmi->mode =
-#if CONFIG_DAALA_EC
-          read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
+#if CONFIG_EC_MULTISYMBOL
+          read_intra_mode_cdf(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
 #else
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
 #endif