Remove the dct_only experiment

Change-Id: I33bb6e902e3be2847ae8101199d9cbd0e1e5c38d

av1/common/blockd.h

@@ -908,7 +908,7 @@ static INLINE TX_TYPE get_default_tx_type(PLANE_TYPE plane_type,
                                           TX_SIZE tx_size) {
   const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
 
-  if (CONFIG_DCT_ONLY || is_inter_block(mbmi) || plane_type != PLANE_TYPE_Y ||
+  if (is_inter_block(mbmi) || plane_type != PLANE_TYPE_Y ||
       xd->lossless[mbmi->segment_id] || tx_size >= TX_32X32)
     return DCT_DCT;
 

av1/common/idct.c

@@ -232,10 +232,6 @@ void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
   tran_low_t *outp = &out[0][0];
   int outstride = 4;
 
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
-
   // inverse transform row vectors
   for (int i = 0; i < 4; ++i) {
 #if CONFIG_DAALA_TX4
@@ -279,9 +275,6 @@ void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                          const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_4x8[] = {
 #if CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8
     { daala_idct8, daala_idct4 },  // DCT_DCT  = 0
@@ -382,9 +375,6 @@ void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                          const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_8x4[] = {
 #if CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8
     { daala_idct4, daala_idct8 },  // DCT_DCT  = 0
@@ -485,9 +475,6 @@ void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                           const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_4x16[] = {
     { aom_idct16_c, aom_idct4_c },    // DCT_DCT
     { aom_iadst16_c, aom_idct4_c },   // ADST_DCT
@@ -541,9 +528,6 @@ void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                           const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_16x4[] = {
     { aom_idct4_c, aom_idct16_c },    // DCT_DCT
     { aom_iadst4_c, aom_idct16_c },   // ADST_DCT
@@ -597,9 +581,6 @@ void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                            const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_8x16[] = {
 #if CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16
     { daala_idct16, daala_idct8 },  // DCT_DCT  = 0
@@ -699,9 +680,6 @@ void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                            const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_16x8[] = {
 #if CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16
     { daala_idct8, daala_idct16 },  // DCT_DCT  = 0
@@ -804,9 +782,6 @@ void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                            const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_8x32[] = {
     { aom_idct32_c, aom_idct8_c },     // DCT_DCT
     { ihalfright32_c, aom_idct8_c },   // ADST_DCT
@@ -860,9 +835,6 @@ void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                            const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_32x8[] = {
     { aom_idct8_c, aom_idct32_c },     // DCT_DCT
     { aom_iadst8_c, aom_idct32_c },    // ADST_DCT
@@ -916,9 +888,6 @@ void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                             const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_16x32[] = {
 #if CONFIG_DAALA_TX16 && CONFIG_DAALA_TX32
     { daala_idct32, daala_idct16 },  // DCT_DCT  = 0
@@ -1001,9 +970,6 @@ void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                             const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_32x16[] = {
 #if CONFIG_DAALA_TX16 && CONFIG_DAALA_TX32
     { daala_idct16, daala_idct32 },  // DCT_DCT  = 0
@@ -1085,9 +1051,6 @@ void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                          const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_8[] = {
 #if CONFIG_DAALA_TX8
     { daala_idct8, daala_idct8 },  // DCT_DCT  = 0
@@ -1174,9 +1137,6 @@ void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                             const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_16[] = {
 #if CONFIG_DAALA_TX16
     { daala_idct16, daala_idct16 },  // DCT_DCT  = 0
@@ -1261,9 +1221,6 @@ void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_32[] = {
 #if CONFIG_DAALA_TX32
     { daala_idct32, daala_idct32 },  // DCT_DCT
@@ -1346,9 +1303,6 @@ void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht64x64_4096_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_64[] = {
 #if CONFIG_DAALA_TX64
     { daala_idct64, daala_idct64 },  // DCT_DCT
@@ -1446,9 +1400,6 @@ void av1_iht64x64_4096_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht64x32_2048_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_64x32[] = {
 #if CONFIG_DAALA_TX32 && CONFIG_DAALA_TX64
     { daala_idct32, daala_idct64 },  // DCT_DCT
@@ -1541,9 +1492,6 @@ void av1_iht64x32_2048_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht32x64_2048_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_32x64[] = {
 #if CONFIG_DAALA_TX32 && CONFIG_DAALA_TX64
     { daala_idct64, daala_idct32 },  // DCT_DCT
@@ -1634,9 +1582,6 @@ void av1_iht32x64_2048_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht16x64_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_16x64[] = {
     { idct64_col_c, aom_idct16_c },     // DCT_DCT
     { ihalfright64_c, aom_idct16_c },   // ADST_DCT
@@ -1698,9 +1643,6 @@ void av1_iht16x64_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void av1_iht64x16_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                              const TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d IHT_64x16[] = {
     { aom_idct16_c, idct64_row_c },     // DCT_DCT
     { aom_iadst16_c, idct64_row_c },    // ADST_DCT

av1/encoder/dct.c

@@ -1153,9 +1153,6 @@ static void maybe_flip_input(const int16_t **src, int *src_stride, int l, int w,
 void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
                   TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
 #if !CONFIG_DAALA_TX4
   if (tx_type == DCT_DCT) {
     aom_fdct4x4_c(input, output, stride);
@@ -1237,9 +1234,6 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride,
                   TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8
     { daala_fdct8, daala_fdct4 },  // DCT_DCT
@@ -1326,9 +1320,6 @@ void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride,
                   TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8
     { daala_fdct4, daala_fdct8 },  // DCT_DCT
@@ -1414,9 +1405,6 @@ void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct16, fdct4 },    // DCT_DCT
     { fadst16, fdct4 },   // ADST_DCT
@@ -1464,9 +1452,6 @@ void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct4, fdct16 },    // DCT_DCT
     { fadst4, fdct16 },   // ADST_DCT
@@ -1514,9 +1499,6 @@ void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16
     { daala_fdct16, daala_fdct8 },  // DCT_DCT
@@ -1619,9 +1601,6 @@ void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16
     { daala_fdct8, daala_fdct16 },  // DCT_DCT
@@ -1724,9 +1703,6 @@ void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct32, fdct8 },         // DCT_DCT
     { fhalfright32, fdct8 },   // ADST_DCT
@@ -1774,9 +1750,6 @@ void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride,
                    TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct8, fdct32 },         // DCT_DCT
     { fadst8, fdct32 },        // ADST_DCT
@@ -1824,9 +1797,6 @@ void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX16 && CONFIG_DAALA_TX32
     { daala_fdct32, daala_fdct16 },  // DCT_DCT
@@ -1910,9 +1880,6 @@ void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX16 && CONFIG_DAALA_TX32
     { daala_fdct16, daala_fdct32 },  // DCT_DCT
@@ -1996,9 +1963,6 @@ void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
                   TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
 #if !CONFIG_DAALA_TX8
   if (tx_type == DCT_DCT) {
     aom_fdct8x8_c(input, output, stride);
@@ -2136,9 +2100,6 @@ void av1_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride) {
 void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX16
     { daala_fdct16, daala_fdct16 },  // DCT_DCT
@@ -2225,9 +2186,6 @@ void av1_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output,
 void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX32
     { daala_fdct32, daala_fdct32 },  // DCT_DCT
@@ -2343,9 +2301,6 @@ static void fdct64_row(const tran_low_t *input, tran_low_t *output) {
 void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX64
     { daala_fdct64, daala_fdct64 },  // DCT_DCT
@@ -2433,9 +2388,6 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht64x32_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX32 && CONFIG_DAALA_TX64
     { daala_fdct32, daala_fdct64 },  // DCT_DCT
@@ -2529,9 +2481,6 @@ void av1_fht64x32_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht32x64_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
 #if CONFIG_DAALA_TX32 && CONFIG_DAALA_TX64
     { daala_fdct64, daala_fdct32 },  // DCT_DCT
@@ -2618,9 +2567,6 @@ void av1_fht32x64_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht16x64_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct64_col, fdct16 },     // DCT_DCT
     { fhalfright64, fdct16 },   // ADST_DCT
@@ -2671,9 +2617,6 @@ void av1_fht16x64_c(const int16_t *input, tran_low_t *output, int stride,
 void av1_fht64x16_c(const int16_t *input, tran_low_t *output, int stride,
                     TxfmParam *txfm_param) {
   const TX_TYPE tx_type = txfm_param->tx_type;
-#if CONFIG_DCT_ONLY
-  assert(tx_type == DCT_DCT);
-#endif
   static const transform_2d FHT[] = {
     { fdct16, fdct64_row },     // DCT_DCT
     { fadst16, fdct64_row },    // ADST_DCT

build/cmake/aom_config_defaults.cmake

@@ -119,7 +119,6 @@ set(CONFIG_DAALA_TX64 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DAALA_TX8 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DAALA_TX_DST32 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DAALA_TX_DST8 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_DCT_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DEBLOCK_13TAP 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DEPENDENT_HORZTILEGROUPS 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DEPENDENT_HORZTILES 0 CACHE NUMBER "AV1 experiment flag.")