commit 6396d3ac0896ebaae43fa8d368190ca07245b78f
author Debargha Mukherjee <debargha@google.com> Thu Dec 21 00:12:38 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Sat Dec 23 17:16:11 2017 -0800
tree da35d8006de43ae8a75213c9bcb623c3e1e9d5eb
parent 94e3fe3b2f21d4c821336fd85d89bf07f4144d55

Bake in large chroma transforms for inter/intra

Bakes in DISABLE_VARTX_FOR_CHROMA/DISABLE_SMLTX_FOR_CHROMA_INTRA
macros.
Cleans up code and removes the unwieldy uv_txsize_lookup array.

Change-Id: I9aec8bfcfe218791517ab18e427bc645687916c3

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 262905a..a2bcaa6 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -39,12 +39,6 @@
 #define COMPOUND_SEGMENT_TYPE 1
 #define MAX_SEG_MASK_BITS 1
 
-// Disables vartx transform split for chroma
-#define DISABLE_VARTX_FOR_CHROMA 1
-
-// Disables small transform split for intra modes.
-#define DISABLE_SMLTX_FOR_CHROMA_INTRA 1
-
 // SEG_MASK_TYPES should not surpass 1 << MAX_SEG_MASK_BITS
 typedef enum {
 #if COMPOUND_SEGMENT_TYPE == 0
@@ -1151,23 +1145,7 @@
 
 static INLINE TX_SIZE av1_get_uv_tx_size(const MB_MODE_INFO *mbmi, int ss_x,
                                          int ss_y) {
-  if (is_inter_block(mbmi)) {
-#if DISABLE_VARTX_FOR_CHROMA
-    return av1_get_max_uv_txsize(mbmi->sb_type, 1, ss_x, ss_y);
-#endif  // DISABLE_VARTX_FOR_CHROMA
-  } else {
-#if DISABLE_SMLTX_FOR_CHROMA_INTRA
-    return av1_get_max_uv_txsize(mbmi->sb_type, 0, ss_x, ss_y);
-#endif  // DISABLE_SMLTX_FOR_CHROMA_INTRA
-#if CONFIG_CFL
-    if (mbmi->uv_mode == UV_CFL_PRED)
-      return av1_get_max_uv_txsize(mbmi->sb_type, 0, ss_x, ss_y);
-#endif
-  }
-  const TX_SIZE uv_txsize =
-      uv_txsize_lookup[mbmi->sb_type][mbmi->tx_size][ss_x][ss_y];
-  assert(uv_txsize != TX_INVALID);
-  return uv_txsize;
+  return av1_get_max_uv_txsize(mbmi->sb_type, is_inter_block(mbmi), ss_x, ss_y);
 }
 
 static INLINE TX_SIZE av1_get_tx_size(int plane, const MACROBLOCKD *xd) {
@@ -1178,24 +1156,6 @@
   return av1_get_uv_tx_size(mbmi, pd->subsampling_x, pd->subsampling_y);
 }
 
-// Temporary function to facilitate removal of uv_txsize_lookup if we
-// decide to go with DISABLE_SMLTX_FOR_CHROMA_INTRA = 1
-// TODO(debargha): Clean this up
-static INLINE TX_SIZE av1_get_uv_tx_size_vartx(
-    const MB_MODE_INFO *mbmi, const struct macroblockd_plane *pd,
-    BLOCK_SIZE bsize, int tx_row, int tx_col) {
-#if DISABLE_VARTX_FOR_CHROMA
-  (void)bsize;
-  (void)tx_row;
-  (void)tx_col;
-  return av1_get_max_uv_txsize(mbmi->sb_type, 1, pd->subsampling_x,
-                               pd->subsampling_y);
-#else
-  (void)pd;
-  return uv_txsize_lookup[bsize][mbmi->inter_tx_size[tx_row][tx_col]][0][0];
-#endif  // DISABLE_VARTX_FOR_CHROMA
-}
-
 void av1_reset_skip_context(MACROBLOCKD *xd, int mi_row, int mi_col,
                             BLOCK_SIZE bsize);