Merge "Re-enable ActiveMapTest for VP10" into nextgenv2
This commit is contained in:
@@ -95,23 +95,13 @@ TEST_P(ActiveMapTestLarge, Test) {
|
|||||||
VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
|
VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
|
||||||
::testing::Values(::libvpx_test::kRealTime),
|
::testing::Values(::libvpx_test::kRealTime),
|
||||||
::testing::Range(0, 9));
|
::testing::Range(0, 9));
|
||||||
#if CONFIG_VP10
|
|
||||||
VP10_INSTANTIATE_TEST_CASE(ActiveMapTestLarge,
|
VP10_INSTANTIATE_TEST_CASE(ActiveMapTestLarge,
|
||||||
::testing::Values(::libvpx_test::kRealTime),
|
::testing::Values(::libvpx_test::kRealTime),
|
||||||
::testing::Range(0, 5));
|
::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,
|
VP10_INSTANTIATE_TEST_CASE(ActiveMapTest,
|
||||||
::testing::Values(::libvpx_test::kRealTime),
|
::testing::Values(::libvpx_test::kRealTime),
|
||||||
::testing::Range(5, 9));
|
::testing::Range(5, 9));
|
||||||
#endif // CONFIG_SUPERTX
|
|
||||||
#endif // CONFIG_VP10
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
Reference in New Issue
Block a user