Commit e5b46b53 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Remove unnecessary config flags for rect-tx-ext

Change-Id: I496c2a83b227ec88a6cd59a4c227b59eeeb0fc86
parent 304c452c
......@@ -257,7 +257,6 @@ void av1_fwd_txfm2d_32x16_c(const int16_t *input, int32_t *output, int stride,
fwd_txfm2d_c(input, output, stride, &cfg, txfm_buf, bd);
}
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
void av1_fwd_txfm2d_4x16_c(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type, int bd) {
#if CONFIG_TXMG
......@@ -323,7 +322,6 @@ void av1_fwd_txfm2d_32x8_c(const int16_t *input, int32_t *output, int stride,
av1_get_fwd_txfm_cfg(tx_type, TX_32X8, &cfg);
fwd_txfm2d_c(input, output, stride, &cfg, txfm_buf, bd);
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
void av1_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type, int bd) {
......
......@@ -412,7 +412,6 @@ void av1_inv_txfm2d_add_32x64_c(const int32_t *input, uint16_t *output,
}
#endif // CONFIG_TX64X64
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
void av1_inv_txfm2d_add_4x16_c(const int32_t *input, uint16_t *output,
int stride, TX_TYPE tx_type, int bd) {
int txfm_buf[4 * 16 + 16 + 16];
......@@ -470,4 +469,3 @@ void av1_inv_txfm2d_add_32x8_c(const int32_t *input, uint16_t *output,
inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_32X8, bd);
#endif // CONFIG_TXMG
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
......@@ -328,7 +328,6 @@ static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
left_ec = !!*(const uint64_t *)l;
break;
#endif // CONFIG_TX64X64
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_4X16:
above_ec = a[0] != 0;
left_ec = !!*(const uint32_t *)l;
......@@ -345,7 +344,6 @@ static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
above_ec = !!*(const uint64_t *)a;
left_ec = !!*(const uint16_t *)l;
break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0 && "Invalid transform size."); break;
}
return combine_entropy_contexts(above_ec, left_ec);
......
......@@ -1788,7 +1788,6 @@ static void inv_txfm_add_8x4(const tran_low_t *input, uint8_t *dest, int stride,
}
// These will be used by the masked-tx experiment in the future.
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void inv_txfm_add_4x16(const tran_low_t *input, uint8_t *dest,
int stride, const TxfmParam *txfm_param) {
av1_iht4x16_64_add(input, dest, stride, txfm_param);
......@@ -1808,7 +1807,6 @@ static void inv_txfm_add_32x8(const tran_low_t *input, uint8_t *dest,
int stride, const TxfmParam *txfm_param) {
av1_iht32x8_256_add(input, dest, stride, txfm_param);
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void inv_txfm_add_8x16(const tran_low_t *input, uint8_t *dest,
int stride, const TxfmParam *txfm_param) {
......@@ -2097,7 +2095,6 @@ static void highbd_inv_txfm_add_32x16(const tran_low_t *input, uint8_t *dest,
txfm_param->tx_type, txfm_param->bd);
}
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void highbd_inv_txfm_add_16x4(const tran_low_t *input, uint8_t *dest,
int stride, const TxfmParam *txfm_param) {
const int32_t *src = cast_to_int32(input);
......@@ -2125,7 +2122,6 @@ static void highbd_inv_txfm_add_8x32(const tran_low_t *input, uint8_t *dest,
av1_inv_txfm2d_add_8x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
txfm_param->tx_type, txfm_param->bd);
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
#if CONFIG_TX64X64
static void highbd_inv_txfm_add_32x64(const tran_low_t *input, uint8_t *dest,
......@@ -2325,12 +2321,10 @@ void av1_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
// case.
inv_txfm_add_4x4(input, dest, stride, txfm_param);
break;
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_32X8: inv_txfm_add_32x8(input, dest, stride, txfm_param); break;
case TX_8X32: inv_txfm_add_8x32(input, dest, stride, txfm_param); break;
case TX_16X4: inv_txfm_add_16x4(input, dest, stride, txfm_param); break;
case TX_4X16: inv_txfm_add_4x16(input, dest, stride, txfm_param); break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0 && "Invalid transform size"); break;
}
#endif
......@@ -2465,7 +2459,6 @@ void av1_highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
// case.
av1_highbd_inv_txfm_add_4x4(input, dest, stride, txfm_param);
break;
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_16X4:
highbd_inv_txfm_add_16x4(input, dest, stride, txfm_param);
break;
......@@ -2478,7 +2471,6 @@ void av1_highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
case TX_32X8:
highbd_inv_txfm_add_32x8(input, dest, stride, txfm_param);
break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0 && "Invalid transform size"); break;
}
#endif // CONFIG_DAALA_TX
......
......@@ -138,7 +138,6 @@ static void fwd_txfm_64x32(const int16_t *src_diff, tran_low_t *coeff,
}
#endif // CONFIG_TX64X64
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void fwd_txfm_16x4(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
av1_fht16x4(src_diff, coeff, diff_stride, txfm_param);
......@@ -158,7 +157,6 @@ static void fwd_txfm_8x32(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
av1_fht8x32(src_diff, coeff, diff_stride, txfm_param);
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void highbd_fwd_txfm_4x4(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
......@@ -240,7 +238,6 @@ static void highbd_fwd_txfm_32x16(const int16_t *src_diff, tran_low_t *coeff,
txfm_param->bd);
}
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void highbd_fwd_txfm_16x4(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
......@@ -268,7 +265,6 @@ static void highbd_fwd_txfm_8x32(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_8x32_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
txfm_param->bd);
}
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
static void highbd_fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
......@@ -526,7 +522,6 @@ void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
fwd_txfm_32x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_4X4: fwd_txfm_4x4(src_diff, coeff, diff_stride, txfm_param); break;
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_4X16:
fwd_txfm_4x16(src_diff, coeff, diff_stride, txfm_param);
break;
......@@ -539,7 +534,6 @@ void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
case TX_32X8:
fwd_txfm_32x8(src_diff, coeff, diff_stride, txfm_param);
break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0); break;
}
#endif
......@@ -594,7 +588,6 @@ void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
case TX_4X4:
highbd_fwd_txfm_4x4(src_diff, coeff, diff_stride, txfm_param);
break;
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_4X16:
highbd_fwd_txfm_4x16(src_diff, coeff, diff_stride, txfm_param);
break;
......@@ -607,7 +600,6 @@ void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
case TX_32X8:
highbd_fwd_txfm_32x8(src_diff, coeff, diff_stride, txfm_param);
break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0); break;
}
#endif
......
......@@ -817,7 +817,6 @@ static void get_entropy_contexts_plane(
for (i = 0; i < num_4x4_h; i += 4)
t_left[i] = !!*(const uint32_t *)&left[i];
break;
#if CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
case TX_4X16:
memcpy(t_above, above, sizeof(ENTROPY_CONTEXT) * num_4x4_w);
for (i = 0; i < num_4x4_h; i += 4)
......@@ -840,7 +839,6 @@ static void get_entropy_contexts_plane(
for (i = 0; i < num_4x4_h; i += 2)
t_left[i] = !!*(const uint16_t *)&left[i];
break;
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT
default: assert(0 && "Invalid transform size."); break;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment