commit fe67ed6af26b20cb0bd29f3ec94786d76c1241aa
author Timothy B. Terriberry <tterriberry@mozilla.com> Wed Apr 26 16:53:47 2017 -0700
committer Jingning Han <jingning@google.com> Thu Jun 01 18:59:52 2017 +0000
tree 543c3353218929c640b96a8d7be3c9520eddefd0
parent 6e4955d47fe98de9889fa19963665a3cb1e3c4cd

cb4x4: Move sub-4X4 TX sizes behind CONFIG_CHROMA_2X2.

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_2x2 (which is not) in separate steps.

Encoder and decoder output should remain unchanged.

Change-Id: I4e9fcdae49f238b5099a3c74a398fe993c2545f8

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 0cffa79..0022907 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -799,7 +799,7 @@
 
 static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA][EXT_TX_SIZES] =
     {
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2
       { 1, 1, 1, 1, 1 },  // unused
       { 0, 1, 1, 0, 0 },
       { 0, 0, 0, 1, 0 },
@@ -807,12 +807,12 @@
       { 1, 1, 1, 1 },  // unused
       { 1, 1, 0, 0 },
       { 0, 0, 1, 0 },
-#endif  // CONFIG_CB4X4
+#endif  // CONFIG_CHROMA_2X2
     };
 
 static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER][EXT_TX_SIZES] =
     {
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2
       { 1, 1, 1, 1, 1 },  // unused
       { 0, 1, 1, 0, 0 },
       { 0, 0, 0, 1, 0 },
@@ -822,7 +822,7 @@
       { 1, 1, 0, 0 },
       { 0, 0, 1, 0 },
       { 0, 0, 0, 1 },
-#endif  // CONFIG_CB4X4
+#endif  // CONFIG_CHROMA_2X2
     };
 
 // Transform types used in each intra set
@@ -1055,7 +1055,7 @@
 
     if (is_inter_block(mbmi)) {
 // UV Inter only
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2
       if (tx_size < TX_4X4) return DCT_DCT;
 #endif
       return (mbmi->tx_type == IDTX && txsize_sqr_map[tx_size] >= TX_32X32)
@@ -1066,11 +1066,13 @@
 
 #if CONFIG_CB4X4
   (void)block;
+#if CONFIG_CHROMA_2X2
   if (tx_size < TX_4X4)
     return DCT_DCT;
   else
+#endif
     return intra_mode_to_tx_type_context[mbmi->uv_mode];
-#else
+#else   // CONFIG_CB4X4
 
   // Sub8x8-Inter/Intra OR UV-Intra
   if (is_inter_block(mbmi))  // Sub8x8-Inter
@@ -1114,7 +1116,7 @@
 static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi,
                                      const struct macroblockd_plane *pd) {
   TX_SIZE uv_txsize;
-#if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2
   assert(mbmi->tx_size > TX_2X2);
 #endif
 
@@ -1126,9 +1128,6 @@
 
   uv_txsize = uv_txsize_lookup[mbmi->sb_type][mbmi->tx_size][pd->subsampling_x]
                               [pd->subsampling_y];
-#if CONFIG_CB4X4 && !CONFIG_CHROMA_2X2
-  uv_txsize = AOMMAX(uv_txsize, TX_4X4);
-#endif
   assert(uv_txsize != TX_INVALID);
   return uv_txsize;
 }