commit 5d149e1d6596c7d335e4f93374ca62d55947dd35
author Debargha Mukherjee <debargha@google.com> Thu Dec 14 12:49:51 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Dec 15 20:45:57 2017 +0000
tree dbf9c23164ece470229b2c5fd29d1ebb1c83b967
parent f54656db78e5cf81e176c77ac5fba61ebb97573d

Remove sub-4x4 block sizes

Removes unused BLOCK_2X2, BLOCK_2X4 and BLOCK_4X2 from the
BLOCK_SIZE enum.

Change-Id: I964d99718026c51a1eaf30d4a1fc83cc52f94083

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index cda8f6f..361eaf5 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -892,9 +892,6 @@
 
 static INLINE int is_rect_tx_allowed_bsize(BLOCK_SIZE bsize) {
   static const char LUT[BLOCK_SIZES_ALL] = {
-    0,  // BLOCK_2X2
-    0,  // BLOCK_2X4
-    0,  // BLOCK_4X2
     0,  // BLOCK_4X4
     1,  // BLOCK_4X8
     1,  // BLOCK_8X4
@@ -1171,8 +1168,7 @@
                                          const struct macroblockd_plane *pd) {
 #if CONFIG_CFL
   if (!is_inter_block(mbmi) && mbmi->uv_mode == UV_CFL_PRED) {
-    const BLOCK_SIZE plane_bsize =
-        AOMMAX(BLOCK_4X4, get_plane_block_size(mbmi->sb_type, pd));
+    const BLOCK_SIZE plane_bsize = get_plane_block_size(mbmi->sb_type, pd);
     assert(plane_bsize < BLOCK_SIZES_ALL);
     return max_txsize_rect_lookup[0][plane_bsize];
   }