cb4x4: Move sub-4X4 block sizes behind chroma flags.
cb4x4 itself should not require these sizes.
This simplifies compatibility with other experiments, since we can
first make them work with cb4x4 (which is now on by default), and
then worry about chroma_sub8x8 and chroma_2x2 (which is not) in
separate steps.
Encoder and decoder output should remain unchanged.
Change-Id: Iff2a5494cab3b7d96f881e8bd9cd4bf18c817cfa
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 050b9a7..4f87778 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -916,7 +916,7 @@
#if CONFIG_RECT_TX
static INLINE int is_rect_tx_allowed_bsize(BLOCK_SIZE bsize) {
static const char LUT[BLOCK_SIZES] = {
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
0, // BLOCK_2X2
0, // BLOCK_2X4
0, // BLOCK_4X2
@@ -953,7 +953,7 @@
#if CONFIG_RECT_TX_EXT
static INLINE int is_quarter_tx_allowed_bsize(BLOCK_SIZE bsize) {
static const char LUT_QTTX[BLOCK_SIZES] = {
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
0, // BLOCK_2X2
0, // BLOCK_2X4
0, // BLOCK_4X2
