commit 2fa6e1ce20c076aa48e0032d0d394f109c3c398a
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Mon Sep 11 12:38:10 2017 +0100
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Fri Sep 29 17:12:21 2017 +0000
tree e1cf3fd8e96c4daa46d1d21adbb1ec8ef9beeef7
parent c01cc430880ea5ee0e3d54517d0b21ca564a55e7

Add 32x128/128x32 block sizes

Change-Id: Ieb28f40d85e4db4af33648c32c406dd2931ceb89

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0b5e561..b71011d 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2853,13 +2853,14 @@
 
   if (has_rows && has_cols) {
 #if CONFIG_EXT_PARTITION_TYPES
-    const int bsl =
-        mi_width_log2_lookup[bsize] - mi_width_log2_lookup[BLOCK_8X8];
-    aom_write_symbol(w, p, ec_ctx->partition_cdf[ctx],
-                     av1_num_partition_types[bsl]);
+    const int num_partition_types =
+        (mi_width_log2_lookup[bsize] > mi_width_log2_lookup[BLOCK_8X8])
+            ? EXT_PARTITION_TYPES
+            : PARTITION_TYPES;
 #else
-    aom_write_symbol(w, p, ec_ctx->partition_cdf[ctx], PARTITION_TYPES);
-#endif  // CONFIG_EXT_PARTITION_TYPES
+    const int num_partition_types = PARTITION_TYPES;
+#endif
+    aom_write_symbol(w, p, ec_ctx->partition_cdf[ctx], num_partition_types);
   } else if (!has_rows && has_cols) {
     assert(p == PARTITION_SPLIT || p == PARTITION_HORZ);
     assert(bsize > BLOCK_8X8);