diff options
Diffstat (limited to 'third_party/libaom/source/libaom/test/tile_config_test.cc')
| -rw-r--r-- | third_party/libaom/source/libaom/test/tile_config_test.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/third_party/libaom/source/libaom/test/tile_config_test.cc b/third_party/libaom/source/libaom/test/tile_config_test.cc index 0098903aa8..517d54bd94 100644 --- a/third_party/libaom/source/libaom/test/tile_config_test.cc +++ b/third_party/libaom/source/libaom/test/tile_config_test.cc @@ -28,6 +28,14 @@ typedef struct { const unsigned int tile_cols; } uniformTileConfigParam; +const libaom_test::TestMode kTestModeParams[] = +#if CONFIG_REALTIME_ONLY + { ::libaom_test::kRealTime }; +#else + { ::libaom_test::kRealTime, ::libaom_test::kOnePassGood, + ::libaom_test::kTwoPassGood }; +#endif + static const uniformTileConfigParam uniformTileConfigParams[] = { { 128, 0, 0 }, { 128, 0, 2 }, { 128, 2, 0 }, { 128, 1, 2 }, { 128, 2, 2 }, { 128, 3, 2 }, { 64, 0, 0 }, { 64, 0, 2 }, { 64, 2, 0 }, { 64, 1, 2 }, @@ -254,14 +262,12 @@ TEST_P(NonUniformTileConfigTestLarge, NonUniformTileConfigTest) { } AV1_INSTANTIATE_TEST_SUITE(UniformTileConfigTestLarge, - ::testing::Values(::libaom_test::kOnePassGood, - ::libaom_test::kTwoPassGood), + ::testing::ValuesIn(kTestModeParams), ::testing::ValuesIn(uniformTileConfigParams), ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ)); AV1_INSTANTIATE_TEST_SUITE(NonUniformTileConfigTestLarge, - ::testing::Values(::libaom_test::kOnePassGood, - ::libaom_test::kTwoPassGood), + ::testing::ValuesIn(kTestModeParams), ::testing::ValuesIn(nonUniformTileConfigParams), ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ)); @@ -352,7 +358,6 @@ TEST_P(TileGroupTestLarge, TileGroupCountTest) { } AV1_INSTANTIATE_TEST_SUITE(TileGroupTestLarge, - ::testing::Values(::libaom_test::kOnePassGood, - ::libaom_test::kTwoPassGood), + ::testing::ValuesIn(kTestModeParams), ::testing::ValuesIn(tileGroupTestParams)); } // namespace |