commit f16c3c89c3972068f1f3a7afa26eaedafce735af
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Thu Aug 17 13:24:42 2017 +0100
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Fri Aug 18 08:35:48 2017 +0000
tree 5872cb64c55058111b4b561c36e04019687dc944
parent 94d2a25727a2d5cac56398910a44a7f59b4332d0

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

av1/common/idct.c

diff --git a/av1/common/idct.c b/av1/common/idct.c
index 13596f2..645da40 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -2160,33 +2160,33 @@
   const int32_t *src = (const int32_t *)input;
   switch (tx_type) {
     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,
                                bd);
       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
     case FLIPADST_DCT:
     case DCT_FLIPADST:
     case FLIPADST_FLIPADST:
     case ADST_FLIPADST:
     case FLIPADST_ADST:
-      av1_inv_txfm2d_add_32x32(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type,
-                               bd);
-      break;
-    // use the c version for anything including identity for now
+    case IDTX:
     case V_DCT:
     case H_DCT:
     case V_ADST:
     case H_ADST:
     case V_FLIPADST:
     case H_FLIPADST:
-    case IDTX:
+#endif  // CONFIG_EXT_TX
       av1_inv_txfm2d_add_32x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
                                  tx_type, bd);
       break;
-#endif  // CONFIG_EXT_TX
+
     default: assert(0);
   }
 }