fix mips msa build w/CONFIG_EXT_TX

vp10_fht{16x16,8x8,4x4}_msa and the iht were disabled with this config
in:
4ab19ea Fix assertion failures in mips+msa setting

Change-Id: Ic675258b89ca490e8021c887b705c68428925129

diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index d0e2b4b3f7770d941dbed0f1817ade7421d52d8e..d71bc86e6ce7abdad54b70564d139c9202bb6186 100644 (file)
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -921,6 +921,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans16x16DCT,
                         ::testing::Values(make_tuple(&vpx_fdct16x16_msa,
                                                      &vpx_idct16x16_256_add_msa,
                                                      0, VPX_BITS_8)));
+#if !CONFIG_EXT_TX
 INSTANTIATE_TEST_CASE_P(
     MSA, Trans16x16HT,
     ::testing::Values(make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa,
@@ -931,6 +932,7 @@ INSTANTIATE_TEST_CASE_P(
                                  2, VPX_BITS_8),
                       make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa,
                                  3, VPX_BITS_8)));
+#endif  // !CONFIG_EXT_TX
 INSTANTIATE_TEST_CASE_P(MSA, PartialTrans16x16Test,
                         ::testing::Values(make_tuple(&vpx_fdct16x16_1_msa,
                                                      VPX_BITS_8)));

diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 00114f4d30686ad3a35d22f4d2ab302acc0c8f3c..7b195b59ebe8e62e8a051d84cb4676af7521bd0b 100644 (file)
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -328,6 +328,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans4x4DCT,
                         ::testing::Values(make_tuple(&vpx_fdct4x4_msa,
                                                      &vpx_idct4x4_16_add_msa, 0,
                                                      VPX_BITS_8, 16)));
+#if !CONFIG_EXT_TX
 INSTANTIATE_TEST_CASE_P(
     MSA, Trans4x4HT,
     ::testing::Values(make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 0,
@@ -338,5 +339,6 @@ INSTANTIATE_TEST_CASE_P(
                                  VPX_BITS_8, 16),
                       make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 3,
                                  VPX_BITS_8, 16)));
+#endif  // !CONFIG_EXT_TX
 #endif  // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
 }  // namespace

diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index cfdf519ef78613e7333e5cddc4273dc0eba81bad..78c77919f8c51e481e2a7b6ec4a4177456a6e1fa 100644 (file)
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -742,6 +742,7 @@ INSTANTIATE_TEST_CASE_P(MSA, FwdTrans8x8DCT,
                         ::testing::Values(make_tuple(&vpx_fdct8x8_msa,
                                                      &vpx_idct8x8_64_add_msa, 0,
                                                      VPX_BITS_8)));
+#if !CONFIG_EXT_TX
 INSTANTIATE_TEST_CASE_P(
     MSA, FwdTrans8x8HT,
     ::testing::Values(
@@ -749,5 +750,6 @@ INSTANTIATE_TEST_CASE_P(
         make_tuple(&vp10_fht8x8_msa, &vp10_iht8x8_64_add_msa, 1, VPX_BITS_8),
         make_tuple(&vp10_fht8x8_msa, &vp10_iht8x8_64_add_msa, 2, VPX_BITS_8),
         make_tuple(&vp10_fht8x8_msa, &vp10_iht8x8_64_add_msa, 3, VPX_BITS_8)));
+#endif  // !CONFIG_EXT_TX
 #endif  // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
 }  // namespace