generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mips msa build w/CONFIG_EXT_TX

Browse Source 
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
This commit is contained in:
James Zern
2016-08-13 10:58:54 -07:00
parent 253c001f8f
commit 1c25b7f29e
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/dct16x16_test.cc
View File

@@ -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)));

2
test/fdct4x4_test.cc
View File

@@ -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

2
test/fdct8x8_test.cc
View File

@@ -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