Skip 10/12bit vectors if CONFIG_AV1_HIGHBITDEPTH=0 If CONFIG_AV1_HIGHBITDEPTH is set to 0, skip the test vectors that contain 10-bit or 12-bit video, because the decoder will fail with the AOM_CODEC_UNSUP_BITSTREAM error (with an error message like "Bit-depth 10 not supported"), which is not the error code expected by the test. Tested: cmake ../aom -DCONFIG_AV1_HIGHBITDEPTH=0 make -j20 ./test_libaom --gtest_filter=*TestVectorTest* Before commit 0f0369849b78aa318dbe20203bd1fb36547d78a9, the test would crash with a segmentation fault: https://aomedia-review.googlesource.com/c/aom/+/94942 BUG=aomedia:2489 Change-Id: I572ec4af23ba3d776487fd9ec121b509c9265835
diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc index 1f10a2b..adb9d4d 100644 --- a/test/invalid_file_test.cc +++ b/test/invalid_file_test.cc
@@ -128,23 +128,26 @@ // { threads, filename, res_filename } { 1, "invalid-bug-1814.ivf", NULL }, { 1, "invalid-chromium-906381.ivf", NULL }, - { 1, "invalid-oss-fuzz-9288.ivf", NULL }, { 4, "invalid-oss-fuzz-9463.ivf", NULL }, - { 1, "invalid-oss-fuzz-9482.ivf", NULL }, { 1, "invalid-oss-fuzz-9720.ivf", NULL }, + { 1, "invalid-oss-fuzz-10389.ivf", NULL }, + { 1, "invalid-oss-fuzz-11523.ivf", "invalid-oss-fuzz-11523.ivf.res.2" }, + { 4, "invalid-oss-fuzz-15363.ivf", NULL }, + { 1, "invalid-oss-fuzz-16437.ivf", NULL }, +#if CONFIG_AV1_HIGHBITDEPTH + // These test vectors contain 10-bit or 12-bit video. + { 1, "invalid-oss-fuzz-9288.ivf", NULL }, + { 1, "invalid-oss-fuzz-9482.ivf", NULL }, { 1, "invalid-oss-fuzz-10061.ivf", NULL }, { 1, "invalid-oss-fuzz-10117-mc-buf-use-highbd.ivf", NULL }, { 1, "invalid-oss-fuzz-10227.ivf", NULL }, - { 1, "invalid-oss-fuzz-10389.ivf", NULL }, { 4, "invalid-oss-fuzz-10555.ivf", NULL }, { 1, "invalid-oss-fuzz-10705.ivf", NULL }, { 1, "invalid-oss-fuzz-10723.ivf", NULL }, { 1, "invalid-oss-fuzz-10779.ivf", NULL }, { 1, "invalid-oss-fuzz-11477.ivf", NULL }, { 1, "invalid-oss-fuzz-11479.ivf", "invalid-oss-fuzz-11479.ivf.res.2" }, - { 1, "invalid-oss-fuzz-11523.ivf", "invalid-oss-fuzz-11523.ivf.res.2" }, - { 4, "invalid-oss-fuzz-15363.ivf", NULL }, - { 1, "invalid-oss-fuzz-16437.ivf", NULL }, +#endif }; AV1_INSTANTIATE_TEST_CASE(InvalidFileTest,