commit 5fe79db38b97f4a0f50567a48af3d5b790f808c5
author Jingning Han <jingning@google.com> Mon Mar 27 15:10:30 2017 -0700
committer Jingning Han <jingning@google.com> Tue Mar 28 02:58:08 2017 +0000
tree cce18a2d9c257445ab516e771beca29769ef88a1
parent cd95976b7ae38e2566fdecf25d5f2430a6731947

Refactor read_partition()

Replace multiple calls for partition_cdf with a unified variable
in ec-multisymbol. This siliences a compiler warning in the
ec-multisymbol.

Change-Id: I56b07579e89e8fba565c4960d081817c86bc0097

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 4294b0b..8b0dffd 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1976,27 +1976,31 @@
   FRAME_CONTEXT *ec_ctx = cm->fc;
 #endif
 
+#if CONFIG_EC_MULTISYMBOL
+  aom_cdf_prob *partition_cdf = (ctx >= 0) ? ec_ctx->partition_cdf[ctx] : NULL;
+#endif
+
   if (has_rows && has_cols)
 #if CONFIG_EXT_PARTITION_TYPES
     if (bsize <= BLOCK_8X8)
 #if CONFIG_EC_MULTISYMBOL
-      p = (PARTITION_TYPE)aom_read_symbol(r, ec_ctx->partition_cdf[ctx],
-                                          PARTITION_TYPES, ACCT_STR);
+      p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, PARTITION_TYPES,
+                                          ACCT_STR);
 #else
       p = (PARTITION_TYPE)aom_read_tree(r, av1_partition_tree, probs, ACCT_STR);
 #endif
     else
 #if CONFIG_EC_MULTISYMBOL
-      p = (PARTITION_TYPE)aom_read_symbol(r, ec_ctx->partition_cdf[ctx],
-                                          EXT_PARTITION_TYPES, ACCT_STR);
+      p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, EXT_PARTITION_TYPES,
+                                          ACCT_STR);
 #else
       p = (PARTITION_TYPE)aom_read_tree(r, av1_ext_partition_tree, probs,
                                         ACCT_STR);
 #endif
 #else
 #if CONFIG_EC_MULTISYMBOL
-    p = (PARTITION_TYPE)aom_read_symbol(r, ec_ctx->partition_cdf[ctx],
-                                        PARTITION_TYPES, ACCT_STR);
+    p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, PARTITION_TYPES,
+                                        ACCT_STR);
 #else
     p = (PARTITION_TYPE)aom_read_tree(r, av1_partition_tree, probs, ACCT_STR);
 #endif