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

Merge "Fix compiler error in vp8/9 decoder test"

Browse Source
This commit is contained in:
Jingning Han 2015-08-06 19:50:23 +00:00 committed by Gerrit Code Review
commit fb1a8ba35a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/test_vector_test.cc
View File

@ -135,6 +135,7 @@ TEST_P(TestVectorTest, MD5Match) {
// Test VP8 decode in serial mode with single thread. // Test VP8 decode in serial mode with single thread.
// NOTE: VP8 only support serial mode. // NOTE: VP8 only support serial mode.
#if CONFIG_VP8_DECODER
VP8_INSTANTIATE_TEST_CASE( VP8_INSTANTIATE_TEST_CASE(
TestVectorTest, TestVectorTest,
::testing::Combine( ::testing::Combine(
@ -143,8 +144,10 @@ VP8_INSTANTIATE_TEST_CASE(
::testing::ValuesIn(libvpx_test::kVP8TestVectors, ::testing::ValuesIn(libvpx_test::kVP8TestVectors,
libvpx_test::kVP8TestVectors + libvpx_test::kVP8TestVectors +
libvpx_test::kNumVP8TestVectors))); libvpx_test::kNumVP8TestVectors)));
#endif // CONFIG_VP8_DECODER
// Test VP9 decode in serial mode with single thread. // Test VP9 decode in serial mode with single thread.
#if CONFIG_VP9_DECODER
VP9_INSTANTIATE_TEST_CASE( VP9_INSTANTIATE_TEST_CASE(
TestVectorTest, TestVectorTest,
::testing::Combine( ::testing::Combine(
@ -154,8 +157,6 @@ VP9_INSTANTIATE_TEST_CASE(
libvpx_test::kVP9TestVectors + libvpx_test::kVP9TestVectors +
libvpx_test::kNumVP9TestVectors))); libvpx_test::kNumVP9TestVectors)));
#if CONFIG_VP9_DECODER
// Test VP9 decode in frame parallel mode with different number of threads. // Test VP9 decode in frame parallel mode with different number of threads.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
VP9MultiThreadedFrameParallel, TestVectorTest, VP9MultiThreadedFrameParallel, TestVectorTest,