ref: 4a25b59bbdbc6f30922739517723d0087defb7a3
parent: 3d253b0c7115843fc588da9add500fccc9a80452
parent: e6f0c26268e8f32581f685aa9d08a47bdbb21521
author: James Zern <jzern@google.com>
date: Fri Sep 2 21:14:54 EDT 2016
Merge "invalid_file_test: quiet -Wunused-const-variable warnings"
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -158,6 +158,7 @@
TEST_P(InvalidFileInvalidPeekTest, ReturnCode) { RunTest(); }
+#if CONFIG_VP8_DECODER
const DecodeParam kVP8InvalidFileTests[] = {
{ 1, "invalid-vp80-00-comprehensive-018.ivf.2kf_0x6.ivf" },
};
@@ -164,7 +165,9 @@
VP8_INSTANTIATE_TEST_CASE(InvalidFileInvalidPeekTest,
::testing::ValuesIn(kVP8InvalidFileTests));
+#endif // CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
const DecodeParam kVP9InvalidFileInvalidPeekTests[] = {
{ 1, "invalid-vp90-01-v3.webm" },
};
@@ -172,7 +175,6 @@
VP9_INSTANTIATE_TEST_CASE(InvalidFileInvalidPeekTest,
::testing::ValuesIn(kVP9InvalidFileInvalidPeekTests));
-#if CONFIG_VP9_DECODER
const DecodeParam kMultiThreadedVP9InvalidFileTests[] = {
{ 4, "invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm" },
{ 4,