commit b95cf12e9e286f387ffa5c76fe9f7bad7f9f8bfd
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Mon Jul 31 16:51:12 2017 +0100
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Aug 01 09:22:52 2017 +0000
tree 82bc05c95986ca19b4efff437c900168a1c65955
parent 964cabf5e43d839daeac6cb66fa9f3323a3f34f7

ext_partition_types: Pass the correct CDF length for partitions

Each CDF for partitioning square blocks is initialised from
an entry of default_partition_cdf in entropymode.c. These CDFs are of
different lengths, depending on which partition types are supported by
the block size.

For example, 8x8 blocks have a CDF with only 4 entries (PARTITION_NONE
through PARTITION_SPLIT). Blocks of a size that supports 1:4 and 4:1
partitions have 10 entries. Currently, that's only 32x32 blocks. All
other blocks have 8 entries.

Change-Id: Ie2126b6d41afc0efedcc5b5b37fc1d0427b9a9fa

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 5740f53..07e4ea4 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2291,24 +2291,23 @@
 
   aom_cdf_prob *partition_cdf = (ctx >= 0) ? ec_ctx->partition_cdf[ctx] : NULL;
 
-  if (has_rows && has_cols)
+  if (has_rows && has_cols) {
 #if CONFIG_EXT_PARTITION_TYPES
-    if (bsize <= BLOCK_8X8)
-      p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, PARTITION_TYPES,
-                                          ACCT_STR);
-    else
-      p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, EXT_PARTITION_TYPES,
-                                          ACCT_STR);
+    const int bsl =
+        mi_width_log2_lookup[bsize] - mi_width_log2_lookup[BLOCK_8X8];
+    p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf,
+                                        av1_num_partition_types[bsl], ACCT_STR);
 #else
     p = (PARTITION_TYPE)aom_read_symbol(r, partition_cdf, PARTITION_TYPES,
                                         ACCT_STR);
 #endif  // CONFIG_EXT_PARTITION_TYPES
-  else if (!has_rows && has_cols)
+  } else if (!has_rows && has_cols) {
     p = aom_read(r, probs[1], ACCT_STR) ? PARTITION_SPLIT : PARTITION_HORZ;
-  else if (has_rows && !has_cols)
+  } else if (has_rows && !has_cols) {
     p = aom_read(r, probs[2], ACCT_STR) ? PARTITION_SPLIT : PARTITION_VERT;
-  else
+  } else {
     p = PARTITION_SPLIT;
+  }
 
   if (counts) ++counts->partition[ctx][p];