ref: d93fe856b90de5ec9ab559d0852d47a22b78fd81
parent: 0dd591bedd89deb841799388cc43b69148a27674
parent: 5b9dacd297c29262f81900972eeb2ae1ae64d1c5
author: James Zern <jzern@google.com>
date: Tue Feb 17 09:05:32 EST 2015
Merge "test_vector_test: fix build with --disable-(vp8|vp9)"
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -135,32 +135,27 @@
// Test VP8 decode in serial mode with single thread.
// NOTE: VP8 only support serial mode.
-INSTANTIATE_TEST_CASE_P(
- VP8, TestVectorTest,
+VP8_INSTANTIATE_TEST_CASE(
+ TestVectorTest,
::testing::Combine(
- ::testing::Values(
- static_cast<const libvpx_test::CodecFactory *>(&libvpx_test::kVP8)),
- ::testing::Combine(
- ::testing::Values(0), // Serial Mode.
- ::testing::Values(1), // Single thread.
- ::testing::ValuesIn(libvpx_test::kVP8TestVectors,
- libvpx_test::kVP8TestVectors +
- libvpx_test::kNumVP8TestVectors))));
+ ::testing::Values(0), // Serial Mode.
+ ::testing::Values(1), // Single thread.
+ ::testing::ValuesIn(libvpx_test::kVP8TestVectors,
+ libvpx_test::kVP8TestVectors +
+ libvpx_test::kNumVP8TestVectors)));
// Test VP9 decode in serial mode with single thread.
-INSTANTIATE_TEST_CASE_P(
- VP9, TestVectorTest,
+VP9_INSTANTIATE_TEST_CASE(
+ TestVectorTest,
::testing::Combine(
- ::testing::Values(
- static_cast<const libvpx_test::CodecFactory *>(&libvpx_test::kVP9)),
- ::testing::Combine(
- ::testing::Values(0), // Serial Mode.
- ::testing::Values(1), // Single thread.
- ::testing::ValuesIn(libvpx_test::kVP9TestVectors,
- libvpx_test::kVP9TestVectors +
- libvpx_test::kNumVP9TestVectors))));
+ ::testing::Values(0), // Serial Mode.
+ ::testing::Values(1), // Single thread.
+ ::testing::ValuesIn(libvpx_test::kVP9TestVectors,
+ libvpx_test::kVP9TestVectors +
+ libvpx_test::kNumVP9TestVectors)));
+#if CONFIG_VP9_DECODER
// Test VP9 decode in frame parallel mode with different number of threads.
INSTANTIATE_TEST_CASE_P(
VP9MultiThreadedFrameParallel, TestVectorTest,
@@ -173,4 +168,5 @@
::testing::ValuesIn(libvpx_test::kVP9TestVectors,
libvpx_test::kVP9TestVectors +
libvpx_test::kNumVP9TestVectors))));
+#endif
} // namespace
--
⑨