Commit 02d23fbb authored by Angie Chiang's avatar Angie Chiang
Browse files

Fit adst/dct's stage range into 32-bit in bd12

Change-Id: Ie428c6f0655873de3e77e844a2f2e4203cf47dff
parent ff8c490b
......@@ -1306,9 +1306,16 @@ void vp10_highbd_inv_txfm_add_4x4(const tran_low_t *input, uint8_t *dest,
&inv_txfm_2d_cfg_dct_dct_4, bd);
break;
case ADST_DCT:
vp10_inv_txfm2d_add_4x4(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_dct_4, bd);
break;
case DCT_ADST:
vp10_inv_txfm2d_add_4x4(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_dct_adst_4, bd);
break;
case ADST_ADST:
vp10_highbd_iht4x4_16_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_4x4(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_adst_4, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......@@ -1347,9 +1354,16 @@ void vp10_highbd_inv_txfm_add_8x8(const tran_low_t *input, uint8_t *dest,
&inv_txfm_2d_cfg_dct_dct_8, bd);
break;
case ADST_DCT:
vp10_inv_txfm2d_add_8x8(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_dct_8, bd);
break;
case DCT_ADST:
vp10_inv_txfm2d_add_8x8(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_dct_adst_8, bd);
break;
case ADST_ADST:
vp10_highbd_iht8x8_64_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_8x8(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_adst_8, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......@@ -1388,9 +1402,16 @@ void vp10_highbd_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
&inv_txfm_2d_cfg_dct_dct_16, bd);
break;
case ADST_DCT:
vp10_inv_txfm2d_add_16x16(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_dct_16, bd);
break;
case DCT_ADST:
vp10_inv_txfm2d_add_16x16(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_dct_adst_16, bd);
break;
case ADST_ADST:
vp10_highbd_iht16x16_256_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_16x16(input, CONVERT_TO_SHORTPTR(dest), stride,
&inv_txfm_2d_cfg_adst_adst_16, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......
This diff is collapsed.
This diff is collapsed.
......@@ -199,9 +199,16 @@ void vp10_highbd_fwd_txfm_4x4(const int16_t *src_diff, tran_low_t *coeff,
&fwd_txfm_2d_cfg_dct_dct_4, bd);
break;
case ADST_DCT:
vp10_fwd_txfm2d_4x4(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_dct_4, bd);
break;
case DCT_ADST:
vp10_fwd_txfm2d_4x4(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_dct_adst_4, bd);
break;
case ADST_ADST:
vp10_highbd_fht4x4_c(src_diff, coeff, diff_stride, tx_type);
vp10_fwd_txfm2d_4x4(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_adst_4, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......@@ -239,12 +246,16 @@ static void highbd_fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
&fwd_txfm_2d_cfg_dct_dct_8, bd);
break;
case ADST_DCT:
vp10_fwd_txfm2d_8x8(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_dct_8, bd);
break;
case DCT_ADST:
vp10_fwd_txfm2d_8x8(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_dct_adst_8, bd);
break;
case ADST_ADST:
if (fwd_txfm_opt == FWD_TXFM_OPT_NORMAL)
vp10_highbd_fht8x8(src_diff, coeff, diff_stride, tx_type);
else // FWD_TXFM_OPT_DC
vpx_highbd_fdct8x8_1(src_diff, coeff, diff_stride);
vp10_fwd_txfm2d_8x8(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_adst_8, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......@@ -283,12 +294,16 @@ static void highbd_fwd_txfm_16x16(const int16_t *src_diff, tran_low_t *coeff,
&fwd_txfm_2d_cfg_dct_dct_16, bd);
break;
case ADST_DCT:
vp10_fwd_txfm2d_16x16(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_dct_16, bd);
break;
case DCT_ADST:
vp10_fwd_txfm2d_16x16(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_dct_adst_16, bd);
break;
case ADST_ADST:
if (fwd_txfm_opt == FWD_TXFM_OPT_NORMAL)
vp10_highbd_fht16x16(src_diff, coeff, diff_stride, tx_type);
else // FWD_TXFM_OPT_DC
vpx_highbd_fdct16x16_1(src_diff, coeff, diff_stride);
vp10_fwd_txfm2d_16x16(src_diff, coeff, diff_stride,
&fwd_txfm_2d_cfg_adst_adst_16, bd);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......
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