Commit f16c3c89 authored by Rupert Swarbrick's avatar Rupert Swarbrick

Only use av1_inv_txfm2d_add_32x32_avx2 for DCT_DCT

The AVX2 code only supports DCT_DCT. For other transform types, use
the C fallback.

Change-Id: I6b472ebd7d963c02aae80ff5846b7f2dcaf092ea
parent 94d2a257
...@@ -2160,33 +2160,33 @@ static void highbd_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest, ...@@ -2160,33 +2160,33 @@ static void highbd_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest,
const int32_t *src = (const int32_t *)input; const int32_t *src = (const int32_t *)input;
switch (tx_type) { switch (tx_type) {
case DCT_DCT: case DCT_DCT:
case ADST_DCT:
case DCT_ADST:
case ADST_ADST:
av1_inv_txfm2d_add_32x32(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, av1_inv_txfm2d_add_32x32(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type,
bd); bd);
break; break;
// The optimised version only supports DCT_DCT, so force use of
// the C version for all other transform types.
case ADST_DCT:
case DCT_ADST:
case ADST_ADST:
#if CONFIG_EXT_TX #if CONFIG_EXT_TX
case FLIPADST_DCT: case FLIPADST_DCT:
case DCT_FLIPADST: case DCT_FLIPADST:
case FLIPADST_FLIPADST: case FLIPADST_FLIPADST:
case ADST_FLIPADST: case ADST_FLIPADST:
case FLIPADST_ADST: case FLIPADST_ADST:
av1_inv_txfm2d_add_32x32(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, case IDTX:
bd);
break;
// use the c version for anything including identity for now
case V_DCT: case V_DCT:
case H_DCT: case H_DCT:
case V_ADST: case V_ADST:
case H_ADST: case H_ADST:
case V_FLIPADST: case V_FLIPADST:
case H_FLIPADST: case H_FLIPADST:
case IDTX: #endif // CONFIG_EXT_TX
av1_inv_txfm2d_add_32x32_c(src, CONVERT_TO_SHORTPTR(dest), stride, av1_inv_txfm2d_add_32x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
tx_type, bd); tx_type, bd);
break; break;
#endif // CONFIG_EXT_TX
default: assert(0); default: assert(0);
} }
} }
......
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