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

Merge "Re-enable ActiveMapTest for VP10" into nextgenv2

Browse Source
This commit is contained in:
Yue Chen
2016-06-20 16:37:53 +00:00
committed by Gerrit Code Review
parent 86b7d39a83 7172e97abe
commit b37c279ab5
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/active_map_test.cc
View File

@@ -95,23 +95,13 @@ TEST_P(ActiveMapTestLarge, Test) {
VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
::testing::Values(::libvpx_test::kRealTime),
::testing::Range(0, 9));
#if CONFIG_VP10
VP10_INSTANTIATE_TEST_CASE(ActiveMapTestLarge,
::testing::Values(::libvpx_test::kRealTime),
::testing::Range(0, 5));
#if CONFIG_SUPERTX
// SuperTx and ActiveMap don't get along at speed 5.
// https://bugs.chromium.org/p/webm/issues/detail?id=1234
INSTANTIATE_TEST_CASE_P(
DISABLED_VP10, ActiveMapTest,
::testing::Combine(
::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
&libvpx_test::kVP10)),
::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 9)));
#else
VP10_INSTANTIATE_TEST_CASE(ActiveMapTest,
::testing::Values(::libvpx_test::kRealTime),
::testing::Range(5, 9));
#endif // CONFIG_SUPERTX
#endif // CONFIG_VP10
} // namespace