commit d8b93f56139e4f4e3b17dd2d21607dd9b630caa7
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Oct 17 09:22:01 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Oct 17 15:44:08 2017 +0000
tree faa29cebdf5ad688158f65dae0a20cb664fcdf6a
parent 12546aa2438117c4869a7b26b72a1865a471b871

Remove abandonned CHROMA_2X2 experiment

Change-Id: I5bff0a68602a89ce480fec049c8b2c4bce44f6bb

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index d8fe02b..3b542e0 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-#if (CONFIG_CHROMA_SUB8X8 || CONFIG_CHROMA_2X2)
+#if (CONFIG_CHROMA_SUB8X8)
 #define SUB8X8_COMP_REF 0
 #else
 #define SUB8X8_COMP_REF 1
@@ -1068,7 +1068,7 @@
 #if CONFIG_RECT_TX
 static INLINE int is_rect_tx_allowed_bsize(BLOCK_SIZE bsize) {
   static const char LUT[BLOCK_SIZES_ALL] = {
-#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
+#if CONFIG_CHROMA_SUB8X8
     0,  // BLOCK_2X2
     0,  // BLOCK_2X4
     0,  // BLOCK_4X2
@@ -1117,7 +1117,7 @@
 #if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
 static INLINE int is_quarter_tx_allowed_bsize(BLOCK_SIZE bsize) {
   static const char LUT_QTTX[BLOCK_SIZES_ALL] = {
-#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
+#if CONFIG_CHROMA_SUB8X8
     0,  // BLOCK_2X2
     0,  // BLOCK_2X4
     0,  // BLOCK_4X2
@@ -1306,10 +1306,7 @@
     }
 
     if (is_inter_block(mbmi)) {
-// UV Inter only
-#if CONFIG_CHROMA_2X2
-      if (tx_size < TX_4X4) return DCT_DCT;
-#endif
+      // UV Inter only
       return (mbmi->tx_type == IDTX && txsize_sqr_map[tx_size] >= TX_32X32)
                  ? DCT_DCT
                  : mbmi->tx_type;
@@ -1318,12 +1315,7 @@
 
 #if CONFIG_CB4X4
   (void)block;
-#if CONFIG_CHROMA_2X2
-  if (tx_size < TX_4X4)
-    return DCT_DCT;
-  else
-#endif  // CONFIG_CHROMA_2X2
-    return intra_mode_to_tx_type_context[get_uv_mode(mbmi->uv_mode)];
+  return intra_mode_to_tx_type_context[get_uv_mode(mbmi->uv_mode)];
 #else   // CONFIG_CB4X4
   // Sub8x8-Inter/Intra OR UV-Intra
   if (is_inter_block(mbmi)) {  // Sub8x8-Inter
@@ -1366,10 +1358,6 @@
 
 static INLINE TX_SIZE av1_get_uv_tx_size(const MB_MODE_INFO *mbmi,
                                          const struct macroblockd_plane *pd) {
-#if CONFIG_CHROMA_2X2
-  assert(mbmi->tx_size > TX_2X2);
-#endif  // CONFIG_CHROMA_2X2
-
   const TX_SIZE uv_txsize =
       uv_txsize_lookup[mbmi->sb_type][mbmi->tx_size][pd->subsampling_x]
                       [pd->subsampling_y];