commit 1c25b7f29e76485e062ef04a4d132049e1cd7ab1
author James Zern <jzern@google.com> Sat Aug 13 10:58:54 2016 -0700
committer James Zern <jzern@google.com> Tue Aug 16 17:30:17 2016 -0700
tree 7234371fef52591d05edb8e3d1bb6805a65891eb
parent 253c001f8f43d65865f1c7b0a38f796fab4e194d

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

test/dct16x16_test.cc

diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index d0e2b4b..d71bc86 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -921,6 +921,7 @@
                         ::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 @@
                                  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)));

test/fdct4x4_test.cc

diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 00114f4..7b195b5 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -328,6 +328,7 @@
                         ::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 @@
                                  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

test/fdct8x8_test.cc

diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index cfdf519..78c7791 100644
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -742,6 +742,7 @@
                         ::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 @@
         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