av1_rtcd_defs.pl: rm av1_highbd_inv_txfm_add_NxM These functions are (mostly) unused outside of the file they're defined in. Only the av1_highbd_inv_txfm_add() function is invoked directly. This matches the setup for av1_inv_txfm_add(). Bug: aomedia:3416 Change-Id: Iccfede49f339d6428feb17426d5ab0a1f3eee24a
diff --git a/av1/common/arm/highbd_inv_txfm_neon.c b/av1/common/arm/highbd_inv_txfm_neon.c index 84bc8fd..70c09e7 100644 --- a/av1/common/arm/highbd_inv_txfm_neon.c +++ b/av1/common/arm/highbd_inv_txfm_neon.c
@@ -4965,120 +4965,6 @@ } } -static void highbd_inv_txfm2d_add_4x16_neon(const int32_t *input, - uint16_t *output, int stride, - TX_TYPE tx_type, int eob, - const int bd) { - (void)eob; - TX_SIZE tx_size = TX_4X16; - int32x4_t buf1[16]; - const int8_t *shift = av1_inv_txfm_shift_ls[tx_size]; - const int txw_idx = get_txw_idx(tx_size); - const int txh_idx = get_txh_idx(tx_size); - const int txfm_size_col = tx_size_wide[tx_size]; - const int txfm_size_row = tx_size_high[tx_size]; - const int buf_size_h_div8 = txfm_size_row >> 2; - const transform_1d_neon row_txfm = - highbd_txfm_all_1d_zeros_w8_arr[txw_idx][hitx_1d_tab[tx_type]][0]; - const transform_1d_neon col_txfm = - highbd_txfm_all_1d_zeros_w8_arr[txh_idx][vitx_1d_tab[tx_type]][2]; - const int input_stride = AOMMIN(32, txfm_size_col); - - assert(col_txfm != NULL); - assert(row_txfm != NULL); - int ud_flip, lr_flip; - get_flip_cfg(tx_type, &ud_flip, &lr_flip); - - // 1st stage: column transform - int32x4_t buf0[16]; - const int32_t *input_row = input; - int32x4_t *buf0_cur = buf0; - load_buffer_32bit_input(input_row, input_stride, buf0_cur, txfm_size_row); - for (int i = 0; i < (txfm_size_row >> 2); i++) { - row_txfm(buf0 + (i << 2), buf0 + (i << 2), INV_COS_BIT, 0, bd, -shift[0]); - } - - if (lr_flip) { - for (int j = 0; j < buf_size_h_div8; ++j) { - TRANSPOSE_4X4(buf0[4 * j + 3], buf0[4 * j + 2], buf0[4 * j + 1], - buf0[4 * j], buf1[4 * j], buf1[4 * j + 1], buf1[4 * j + 2], - buf1[4 * j + 3]); - } - } else { - for (int j = 0; j < buf_size_h_div8; ++j) { - TRANSPOSE_4X4(buf0[4 * j], buf0[4 * j + 1], buf0[4 * j + 2], - buf0[4 * j + 3], buf1[4 * j], buf1[4 * j + 1], - buf1[4 * j + 2], buf1[4 * j + 3]); - } - } - - // 2nd stage: column transform - col_txfm(buf1, buf1, INV_COS_BIT, 1, bd, 0); - - round_shift_array_32_neon(buf1, buf1, txfm_size_row, -shift[1]); - - // write to buffer - highbd_write_buffer_4xn_neon(buf1, output, stride, ud_flip, txfm_size_row, - bd); -} - -static void highbd_inv_txfm2d_add_16x4_neon(const int32_t *input, - uint16_t *output, int stride, - TX_TYPE tx_type, int eob, - const int bd) { - (void)eob; - TX_SIZE tx_size = TX_16X4; - int32x4_t buf1[16]; - const int8_t *shift = av1_inv_txfm_shift_ls[tx_size]; - const int txw_idx = get_txw_idx(tx_size); - const int txh_idx = get_txh_idx(tx_size); - const int txfm_size_col = tx_size_wide[tx_size]; - const int txfm_size_row = tx_size_high[tx_size]; - const int buf_size_w_div8 = txfm_size_col >> 2; - const transform_1d_neon row_txfm = - highbd_txfm_all_1d_zeros_w8_arr[txw_idx][hitx_1d_tab[tx_type]][2]; - const transform_1d_neon col_txfm = - highbd_txfm_all_1d_zeros_w8_arr[txh_idx][vitx_1d_tab[tx_type]][0]; - - assert(col_txfm != NULL); - assert(row_txfm != NULL); - int ud_flip, lr_flip; - get_flip_cfg(tx_type, &ud_flip, &lr_flip); - - // 1st stage: column transform - int32x4_t buf0[16]; - const int32_t *input_row = input; - load_buffer_32bit_input(input_row, 4, buf0, txfm_size_col); - - for (int j = 0; j < buf_size_w_div8; j++) { - TRANSPOSE_4X4(buf0[j], buf0[j + 4], buf0[j + 8], buf0[j + 12], buf1[4 * j], - buf1[4 * j + 1], buf1[4 * j + 2], buf1[4 * j + 3]); - } - row_txfm(buf1, buf0, INV_COS_BIT, 0, bd, -shift[0]); - - int32x4_t *buf1_ptr; - if (lr_flip) { - flip_buf_neon(buf0, buf1, txfm_size_col); - buf1_ptr = buf1; - } else { - buf1_ptr = buf0; - } - - // 2nd stage: column transform - for (int i = 0; i < buf_size_w_div8; i++) { - col_txfm(buf1_ptr + i * txfm_size_row, buf1_ptr + i * txfm_size_row, - INV_COS_BIT, 1, bd, 0); - } - round_shift_array_32_neon(buf1_ptr, buf1_ptr, txfm_size_col, -shift[1]); - - // write to buffer - for (int i = 0; i < (txfm_size_col >> 3); i++) { - highbd_write_buffer_8xn_neon(buf1_ptr + i * txfm_size_row * 2, - output + 8 * i, stride, ud_flip, txfm_size_row, - bd); - } -} - static const int lowbd_txfm_all_1d_zeros_idx[32] = { 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -5658,8 +5544,9 @@ } } -void av1_highbd_inv_txfm_add_8x8_neon(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_8x8_neon(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -5682,8 +5569,9 @@ } } -void av1_highbd_inv_txfm_add_4x4_neon(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_4x4_neon(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]); int eob = txfm_param->eob; int bd = txfm_param->bd; @@ -5699,210 +5587,79 @@ bd); } -void av1_highbd_inv_txfm_add_4x8_neon(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { - av1_inv_txfm2d_add_4x8_neon(input, CONVERT_TO_SHORTPTR(dest), stride, - txfm_param->tx_type, txfm_param->bd); -} - -void av1_highbd_inv_txfm_add_8x4_neon(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { - av1_inv_txfm2d_add_8x4_neon(input, CONVERT_TO_SHORTPTR(dest), stride, - txfm_param->tx_type, txfm_param->bd); -} - void av1_inv_txfm2d_add_8x16_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_8X16, bd); } -void av1_highbd_inv_txfm_add_4x16_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - int bd = txfm_param->bd; - const TX_TYPE tx_type = txfm_param->tx_type; - int eob = txfm_param->eob; - highbd_inv_txfm2d_add_4x16_neon(input, CONVERT_TO_SHORTPTR(dest), stride, - tx_type, eob, bd); -} - -void av1_highbd_inv_txfm_add_16x4_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - int bd = txfm_param->bd; - const TX_TYPE tx_type = txfm_param->tx_type; - int eob = txfm_param->eob; - highbd_inv_txfm2d_add_16x4_neon(input, CONVERT_TO_SHORTPTR(dest), stride, - tx_type, eob, bd); -} - -void av1_highbd_inv_txfm_add_8x16_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_8X16, txfm_param->eob, txfm_param->bd); -} - -void av1_highbd_inv_txfm_add_16x8_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_16X8, txfm_param->eob, txfm_param->bd); -} - void av1_inv_txfm2d_add_16x8_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_16X8, bd); } -void av1_highbd_inv_txfm_add_16x32_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_16X32, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_16x32_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_16X32, bd); } -void av1_highbd_inv_txfm_add_32x16_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_32X16, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_32x16_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_32X16, bd); } -void av1_highbd_inv_txfm_add_32x32_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_32X32, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_32x32_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_32X32, bd); } -void av1_highbd_inv_txfm_add_64x64_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_64X64, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_64x64_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_64X64, bd); } -void av1_highbd_inv_txfm_add_32x64_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_32X64, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_32x64_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_32X64, bd); } -void av1_highbd_inv_txfm_add_64x32_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_64X32, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_64x32_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_64X32, bd); } -void av1_highbd_inv_txfm_add_64x16_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_64X16, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_64x16_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_64X16, bd); } -void av1_highbd_inv_txfm_add_16x64_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_16X64, txfm_param->eob, - txfm_param->bd); -} - void av1_inv_txfm2d_add_16x64_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_16X64, bd); } -void av1_highbd_inv_txfm_add_16x16_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_16X16, txfm_param->eob, - txfm_param->bd); -} - -void av1_inv_txfm2d_add_16x16_neon(const tran_low_t *input, uint16_t *dest, - int stride, TX_TYPE tx_type, const int bd) { +static void av1_inv_txfm2d_add_16x16_neon(const tran_low_t *input, + uint16_t *dest, int stride, + TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_16X16, bd); } -void av1_highbd_inv_txfm_add_32x8_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_32X8, txfm_param->eob, txfm_param->bd); -} - void av1_inv_txfm2d_add_32x8_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_32X8, bd); } -void av1_highbd_inv_txfm_add_8x32_neon(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { - highbd_inv_txfm2d_add_universe_neon(input, dest, stride, txfm_param->tx_type, - TX_8X32, txfm_param->eob, txfm_param->bd); -} - void av1_inv_txfm2d_add_8x32_neon(const tran_low_t *input, uint16_t *dest, int stride, TX_TYPE tx_type, const int bd) { inv_txfm2d_add_universe_neon(input, (uint8_t *)dest, stride, tx_type, TX_8X32, @@ -5917,7 +5674,7 @@ int bd = txfm_param->bd; switch (tx_size) { case TX_8X8: - av1_highbd_inv_txfm_add_8x8_neon(input, dest, stride, txfm_param); + highbd_inv_txfm_add_8x8_neon(input, dest, stride, txfm_param); break; case TX_4X8: av1_inv_txfm2d_add_4x8_neon(input, CONVERT_TO_SHORTPTR(dest), stride, @@ -5928,7 +5685,7 @@ txfm_param->tx_type, txfm_param->bd); break; case TX_4X4: - av1_highbd_inv_txfm_add_4x4_neon(input, dest, stride, txfm_param); + highbd_inv_txfm_add_4x4_neon(input, dest, stride, txfm_param); break; case TX_16X4: av1_inv_txfm2d_add_16x4_neon(input, CONVERT_TO_SHORTPTR(dest), stride,
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl index a24d3a9..4700098 100644 --- a/av1/common/av1_rtcd_defs.pl +++ b/av1/common/av1_rtcd_defs.pl
@@ -150,43 +150,6 @@ add_proto qw/void av1_highbd_inv_txfm_add/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; specialize qw/av1_highbd_inv_txfm_add sse4_1 avx2 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_4x4/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_4x4 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_8x8/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_8x8 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_4x8/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_4x8 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_8x4/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_8x4 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_4x16/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_4x16 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_16x4/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_16x4 sse4_1 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_8x16/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_8x16 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_16x8/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_16x8 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_16x32/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_16x32 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_32x16/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_32x16 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_32x32/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_32x32 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_32x64/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_32x64 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_64x32/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_64x32 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_64x64/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_64x64 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_8x32/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_32x32 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_32x8/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_32x64 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_16x64/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_64x32 neon/; -add_proto qw/void av1_highbd_inv_txfm_add_64x16/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param"; -specialize qw/av1_highbd_inv_txfm_add_64x64 neon/; - add_proto qw/void av1_inv_txfm2d_add_4x4/, "const tran_low_t *input, uint8_t *dest, int stride, TX_TYPE tx_type, const int bd"; specialize qw/av1_inv_txfm2d_add_4x4 neon/; add_proto qw/void av1_inv_txfm2d_add_8x8/, "const tran_low_t *input, uint8_t *dest, int stride, TX_TYPE tx_type, const int bd";
diff --git a/av1/common/idct.c b/av1/common/idct.c index bff438f..d4b1c98 100644 --- a/av1/common/idct.c +++ b/av1/common/idct.c
@@ -39,8 +39,8 @@ av1_highbd_iwht4x4_1_add(input, dest, stride, bd); } -void av1_highbd_inv_txfm_add_4x4_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_4x4_c(const tran_low_t *input, uint8_t *dest, + int stride, const TxfmParam *txfm_param) { assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]); int eob = txfm_param->eob; int bd = txfm_param->bd; @@ -56,94 +56,104 @@ av1_inv_txfm2d_add_4x4_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, bd); } -void av1_highbd_inv_txfm_add_4x8_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_4x8_c(const tran_low_t *input, uint8_t *dest, + int stride, const TxfmParam *txfm_param) { assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]); const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_4x8_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_8x4_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_8x4_c(const tran_low_t *input, uint8_t *dest, + int stride, const TxfmParam *txfm_param) { assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]); const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_8x4_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_16x32_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_16x32_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_16x32_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_32x16_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_32x16_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_32x16_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_16x4_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_16x4_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_16x4_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_4x16_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_4x16_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_4x16_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_32x8_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_32x8_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_32x8_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_8x32_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_8x32_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_8x32_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_32x64_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_32x64_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_32x64_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_64x32_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_64x32_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_64x32_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_16x64_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_16x64_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_16x64_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_64x16_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_64x16_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_64x16_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_8x8_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_8x8_c(const tran_low_t *input, uint8_t *dest, + int stride, const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -151,8 +161,9 @@ av1_inv_txfm2d_add_8x8_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, bd); } -void av1_highbd_inv_txfm_add_16x16_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_16x16_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -161,22 +172,25 @@ bd); } -void av1_highbd_inv_txfm_add_8x16_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_8x16_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_8x16_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_16x8_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_16x8_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int32_t *src = cast_to_int32(input); av1_inv_txfm2d_add_16x8_c(src, CONVERT_TO_SHORTPTR(dest), stride, txfm_param->tx_type, txfm_param->bd); } -void av1_highbd_inv_txfm_add_32x32_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_32x32_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -185,8 +199,9 @@ bd); } -void av1_highbd_inv_txfm_add_64x64_c(const tran_low_t *input, uint8_t *dest, - int stride, const TxfmParam *txfm_param) { +static void highbd_inv_txfm_add_64x64_c(const tran_low_t *input, uint8_t *dest, + int stride, + const TxfmParam *txfm_param) { const int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -215,64 +230,64 @@ const TX_SIZE tx_size = txfm_param->tx_size; switch (tx_size) { case TX_32X32: - av1_highbd_inv_txfm_add_32x32_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_32x32_c(input, dest, stride, txfm_param); break; case TX_16X16: - av1_highbd_inv_txfm_add_16x16_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_16x16_c(input, dest, stride, txfm_param); break; case TX_8X8: - av1_highbd_inv_txfm_add_8x8_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_8x8_c(input, dest, stride, txfm_param); break; case TX_4X8: - av1_highbd_inv_txfm_add_4x8_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_4x8_c(input, dest, stride, txfm_param); break; case TX_8X4: - av1_highbd_inv_txfm_add_8x4_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_8x4_c(input, dest, stride, txfm_param); break; case TX_8X16: - av1_highbd_inv_txfm_add_8x16_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_8x16_c(input, dest, stride, txfm_param); break; case TX_16X8: - av1_highbd_inv_txfm_add_16x8_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_16x8_c(input, dest, stride, txfm_param); break; case TX_16X32: - av1_highbd_inv_txfm_add_16x32_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_16x32_c(input, dest, stride, txfm_param); break; case TX_32X16: - av1_highbd_inv_txfm_add_32x16_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_32x16_c(input, dest, stride, txfm_param); break; case TX_64X64: - av1_highbd_inv_txfm_add_64x64_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_64x64_c(input, dest, stride, txfm_param); break; case TX_32X64: - av1_highbd_inv_txfm_add_32x64_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_32x64_c(input, dest, stride, txfm_param); break; case TX_64X32: - av1_highbd_inv_txfm_add_64x32_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_64x32_c(input, dest, stride, txfm_param); break; case TX_16X64: - av1_highbd_inv_txfm_add_16x64_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_16x64_c(input, dest, stride, txfm_param); break; case TX_64X16: - av1_highbd_inv_txfm_add_64x16_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_64x16_c(input, dest, stride, txfm_param); break; case TX_4X4: // this is like av1_short_idct4x4 but has a special case around eob<=1 // which is significant (not just an optimization) for the lossless // case. - av1_highbd_inv_txfm_add_4x4_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_4x4_c(input, dest, stride, txfm_param); break; case TX_16X4: - av1_highbd_inv_txfm_add_16x4_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_16x4_c(input, dest, stride, txfm_param); break; case TX_4X16: - av1_highbd_inv_txfm_add_4x16_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_4x16_c(input, dest, stride, txfm_param); break; case TX_8X32: - av1_highbd_inv_txfm_add_8x32_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_8x32_c(input, dest, stride, txfm_param); break; case TX_32X8: - av1_highbd_inv_txfm_add_32x8_c(input, dest, stride, txfm_param); + highbd_inv_txfm_add_32x8_c(input, dest, stride, txfm_param); break; default: assert(0 && "Invalid transform size"); break; }
diff --git a/av1/common/x86/highbd_inv_txfm_avx2.c b/av1/common/x86/highbd_inv_txfm_avx2.c index cbfe561..73e6911 100644 --- a/av1/common/x86/highbd_inv_txfm_avx2.c +++ b/av1/common/x86/highbd_inv_txfm_avx2.c
@@ -4180,10 +4180,11 @@ } } -void av1_highbd_inv_txfm2d_add_universe_avx2(const int32_t *input, - uint8_t *output, int stride, - TX_TYPE tx_type, TX_SIZE tx_size, - int eob, const int bd) { +static void av1_highbd_inv_txfm2d_add_universe_avx2(const int32_t *input, + uint8_t *output, int stride, + TX_TYPE tx_type, + TX_SIZE tx_size, int eob, + const int bd) { switch (tx_type) { case DCT_DCT: case ADST_DCT: @@ -4216,19 +4217,11 @@ const TX_SIZE tx_size = txfm_param->tx_size; switch (tx_size) { case TX_4X8: - av1_highbd_inv_txfm_add_4x8_sse4_1(input, dest, stride, txfm_param); - break; case TX_8X4: - av1_highbd_inv_txfm_add_8x4_sse4_1(input, dest, stride, txfm_param); - break; case TX_4X4: - av1_highbd_inv_txfm_add_4x4_sse4_1(input, dest, stride, txfm_param); - break; case TX_16X4: - av1_highbd_inv_txfm_add_16x4_sse4_1(input, dest, stride, txfm_param); - break; case TX_4X16: - av1_highbd_inv_txfm_add_4x16_sse4_1(input, dest, stride, txfm_param); + av1_highbd_inv_txfm_add_sse4_1(input, dest, stride, txfm_param); break; default: av1_highbd_inv_txfm2d_add_universe_avx2(
diff --git a/av1/common/x86/highbd_inv_txfm_sse4.c b/av1/common/x86/highbd_inv_txfm_sse4.c index 4ff6a90..c12022c 100644 --- a/av1/common/x86/highbd_inv_txfm_sse4.c +++ b/av1/common/x86/highbd_inv_txfm_sse4.c
@@ -5125,9 +5125,9 @@ } } -void av1_highbd_inv_txfm_add_8x8_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_8x8_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const int32_t *src = cast_to_int32(input); @@ -5149,9 +5149,9 @@ break; } } -void av1_highbd_inv_txfm_add_4x4_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_4x4_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]); int eob = txfm_param->eob; int bd = txfm_param->bd; @@ -5754,9 +5754,9 @@ } } -void av1_highbd_inv_txfm_add_4x8_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_4x8_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const TX_SIZE tx_size = txfm_param->tx_size; @@ -5765,9 +5765,9 @@ tx_type, tx_size, eob, bd); } -void av1_highbd_inv_txfm_add_8x4_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_8x4_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const TX_SIZE tx_size = txfm_param->tx_size; @@ -5776,9 +5776,9 @@ tx_type, tx_size, eob, bd); } -void av1_highbd_inv_txfm_add_4x16_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_4x16_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const TX_SIZE tx_size = txfm_param->tx_size; @@ -5787,9 +5787,9 @@ tx_type, tx_size, eob, bd); } -void av1_highbd_inv_txfm_add_16x4_sse4_1(const tran_low_t *input, uint8_t *dest, - int stride, - const TxfmParam *txfm_param) { +static void av1_highbd_inv_txfm_add_16x4_sse4_1(const tran_low_t *input, + uint8_t *dest, int stride, + const TxfmParam *txfm_param) { int bd = txfm_param->bd; const TX_TYPE tx_type = txfm_param->tx_type; const TX_SIZE tx_size = txfm_param->tx_size;