commit 1687085bc0e1702531838237f437ce1e753d4e20
author Debargha Mukherjee <debargha@google.com> Wed Feb 28 10:00:17 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Feb 28 22:17:59 2018 +0000
tree 6efe42636a66e5361361c407c95549f69a1e4f0b
parent e8ed5908b29e4ca0297586a85981eda2de941c65

Remove CONFIG_EXT_PARTITION_TYPES config flag

This tool is fully adopted.

Change-Id: I51a89d62c97dff0fd6bdbd5bd9c39aa04936b4fe

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e5dafdb..10ce6b6 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1758,10 +1758,8 @@
   const AV1_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
   const int hbs = mi_size_wide[bsize] / 2;
-#if CONFIG_EXT_PARTITION_TYPES
   const int quarter_step = mi_size_wide[bsize] / 4;
   int i;
-#endif  // CONFIG_EXT_PARTITION_TYPES
   const PARTITION_TYPE partition = get_partition(cm, mi_row, mi_col, bsize);
   const BLOCK_SIZE subsize = get_subsize(bsize, partition);
 
@@ -1807,7 +1805,6 @@
       write_modes_sb(cpi, tile, w, tok, tok_end, mi_row + hbs, mi_col + hbs,
                      subsize);
       break;
-#if CONFIG_EXT_PARTITION_TYPES
     case PARTITION_HORZ_A:
       write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
       write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col + hbs);
@@ -1844,18 +1841,11 @@
         write_modes_b(cpi, tile, w, tok, tok_end, mi_row, this_mi_col);
       }
       break;
-#endif  // CONFIG_EXT_PARTITION_TYPES
     default: assert(0);
   }
 
-// update partition context
-#if CONFIG_EXT_PARTITION_TYPES
+  // update partition context
   update_ext_partition_context(xd, mi_row, mi_col, subsize, bsize, partition);
-#else
-  if (bsize >= BLOCK_8X8 &&
-      (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
-    update_partition_context(xd, mi_row, mi_col, subsize, bsize);
-#endif  // CONFIG_EXT_PARTITION_TYPES
 }
 
 static void write_modes(AV1_COMP *const cpi, const TileInfo *const tile,