Commit 1c25b7f2 authored by James Zern's avatar James Zern
Browse files

fix mips msa build w/CONFIG_EXT_TX

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

Change-Id: Ic675258b89ca490e8021c887b705c68428925129
parent 253c001f
...@@ -921,6 +921,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans16x16DCT, ...@@ -921,6 +921,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans16x16DCT,
::testing::Values(make_tuple(&vpx_fdct16x16_msa, ::testing::Values(make_tuple(&vpx_fdct16x16_msa,
&vpx_idct16x16_256_add_msa, &vpx_idct16x16_256_add_msa,
0, VPX_BITS_8))); 0, VPX_BITS_8)));
#if !CONFIG_EXT_TX
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
MSA, Trans16x16HT, MSA, Trans16x16HT,
::testing::Values(make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa, ::testing::Values(make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa,
...@@ -931,6 +932,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -931,6 +932,7 @@ INSTANTIATE_TEST_CASE_P(
2, VPX_BITS_8), 2, VPX_BITS_8),
make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa, make_tuple(&vp10_fht16x16_msa, &vp10_iht16x16_256_add_msa,
3, VPX_BITS_8))); 3, VPX_BITS_8)));
#endif // !CONFIG_EXT_TX
INSTANTIATE_TEST_CASE_P(MSA, PartialTrans16x16Test, INSTANTIATE_TEST_CASE_P(MSA, PartialTrans16x16Test,
::testing::Values(make_tuple(&vpx_fdct16x16_1_msa, ::testing::Values(make_tuple(&vpx_fdct16x16_1_msa,
VPX_BITS_8))); VPX_BITS_8)));
......
...@@ -328,6 +328,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans4x4DCT, ...@@ -328,6 +328,7 @@ INSTANTIATE_TEST_CASE_P(MSA, Trans4x4DCT,
::testing::Values(make_tuple(&vpx_fdct4x4_msa, ::testing::Values(make_tuple(&vpx_fdct4x4_msa,
&vpx_idct4x4_16_add_msa, 0, &vpx_idct4x4_16_add_msa, 0,
VPX_BITS_8, 16))); VPX_BITS_8, 16)));
#if !CONFIG_EXT_TX
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
MSA, Trans4x4HT, MSA, Trans4x4HT,
::testing::Values(make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 0, ::testing::Values(make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 0,
...@@ -338,5 +339,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -338,5 +339,6 @@ INSTANTIATE_TEST_CASE_P(
VPX_BITS_8, 16), VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 3, make_tuple(&vp10_fht4x4_msa, &vp10_iht4x4_16_add_msa, 3,
VPX_BITS_8, 16))); VPX_BITS_8, 16)));
#endif // !CONFIG_EXT_TX
#endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE #endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace } // namespace
...@@ -742,6 +742,7 @@ INSTANTIATE_TEST_CASE_P(MSA, FwdTrans8x8DCT, ...@@ -742,6 +742,7 @@ INSTANTIATE_TEST_CASE_P(MSA, FwdTrans8x8DCT,
::testing::Values(make_tuple(&vpx_fdct8x8_msa, ::testing::Values(make_tuple(&vpx_fdct8x8_msa,
&vpx_idct8x8_64_add_msa, 0, &vpx_idct8x8_64_add_msa, 0,
VPX_BITS_8))); VPX_BITS_8)));
#if !CONFIG_EXT_TX
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
MSA, FwdTrans8x8HT, MSA, FwdTrans8x8HT,
::testing::Values( ::testing::Values(
...@@ -749,5 +750,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -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, 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, 2, VPX_BITS_8),
make_tuple(&vp10_fht8x8_msa, &vp10_iht8x8_64_add_msa, 3, 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 #endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace } // namespace
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