commit 2ccf4b9931890c53098e831dc971a7d1904a1878
author Debargha Mukherjee <debargha@google.com> Tue Feb 27 17:30:46 2018 -0800
committer Fred BARBIER <frederic.barbier@allegrodvt.com> Wed Feb 28 08:29:22 2018 +0000
tree 7e01454a618a20288a65751657fae2fafc985c59
parent b1d534a93607c60ab10fd1d6130e93b58a803266

Remove CONFIG_EXT_PARTITION config flag

This experiment is fully adopted.

Change-Id: I87faae61532a5caf34616ed693857eae5330a340

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ec8a7b7..64acf61 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -940,16 +940,11 @@
   // Initialise when at top left part of the superblock
   if (!(mi_row & (cm->seq_params.mib_size - 1)) &&
       !(mi_col & (cm->seq_params.mib_size - 1))) {  // Top left?
-#if CONFIG_EXT_PARTITION
     cm->cdef_preset[0] = cm->cdef_preset[1] = cm->cdef_preset[2] =
         cm->cdef_preset[3] = -1;
-#else
-    cm->cdef_preset = -1;
-#endif
   }
 
-// Emit CDEF param at first non-skip coding block
-#if CONFIG_EXT_PARTITION
+  // Emit CDEF param at first non-skip coding block
   const int mask = 1 << (6 - MI_SIZE_LOG2);
   const int index = cm->seq_params.sb_size == BLOCK_128X128
                         ? !!(mi_col & mask) + 2 * !!(mi_row & mask)
@@ -958,12 +953,6 @@
     aom_write_literal(w, mbmi->cdef_strength, cm->cdef_bits);
     cm->cdef_preset[index] = mbmi->cdef_strength;
   }
-#else
-  if (cm->cdef_preset == -1 && !skip) {
-    aom_write_literal(w, mbmi->cdef_strength, cm->cdef_bits);
-    cm->cdef_preset = mbmi->cdef_strength;
-  }
-#endif
 }
 
 static void write_inter_segment_id(AV1_COMP *cpi, aom_writer *w,
@@ -1944,14 +1933,9 @@
     }
   }
   if (!all_none) {
-#if CONFIG_EXT_PARTITION
     assert(cm->seq_params.sb_size == BLOCK_64X64 ||
            cm->seq_params.sb_size == BLOCK_128X128);
     const int sb_size = cm->seq_params.sb_size == BLOCK_128X128 ? 128 : 64;
-#else
-    assert(cm->seq_params.sb_size == BLOCK_64X64);
-    const int sb_size = 64;
-#endif
 
     RestorationInfo *rsi = &cm->rst_info[0];
 
@@ -2398,22 +2382,18 @@
     assert(tile_width > 0);
     assert(tile_height > 0);
 
-// Write the tile sizes
-#if CONFIG_EXT_PARTITION
+    // Write the tile sizes
     if (cm->seq_params.sb_size == BLOCK_128X128) {
       assert(tile_width <= 32);
       assert(tile_height <= 32);
       aom_wb_write_literal(wb, tile_width - 1, 5);
       aom_wb_write_literal(wb, tile_height - 1, 5);
     } else {
-#endif  // CONFIG_EXT_PARTITION
       assert(tile_width <= 64);
       assert(tile_height <= 64);
       aom_wb_write_literal(wb, tile_width - 1, 6);
       aom_wb_write_literal(wb, tile_height - 1, 6);
-#if CONFIG_EXT_PARTITION
     }
-#endif  // CONFIG_EXT_PARTITION
   } else {
 #endif  // CONFIG_EXT_TILE
 
@@ -2844,13 +2824,9 @@
   (void)wb;
   assert(seq_params->mib_size == mi_size_wide[seq_params->sb_size]);
   assert(seq_params->mib_size == 1 << seq_params->mib_size_log2);
-#if CONFIG_EXT_PARTITION
   assert(seq_params->sb_size == BLOCK_128X128 ||
          seq_params->sb_size == BLOCK_64X64);
   aom_wb_write_bit(wb, seq_params->sb_size == BLOCK_128X128 ? 1 : 0);
-#else
-  assert(seq_params->sb_size == BLOCK_64X64);
-#endif  // CONFIG_EXT_PARTITION
 }
 
 void write_sequence_header(AV1_COMP *cpi, struct aom_write_bit_buffer *wb) {