Commit 2a670249 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "EC_ADAPT: disable tests requiring tiles." into nextgenv2

parents a2d2a185 0575e6c2
......@@ -49,7 +49,9 @@ const EncodeParameters kAV1EncodeParameterSet[] = {
{ 0, 0, 0, 1, 0, AOM_CR_STUDIO_RANGE, AOM_CS_BT_601, { 0, 0 } },
{ 0, 0, 0, 0, 0, AOM_CR_FULL_RANGE, AOM_CS_BT_709, { 0, 0 } },
{ 0, 0, 1, 0, 0, AOM_CR_FULL_RANGE, AOM_CS_BT_2020, { 0, 0 } },
#if !CONFIG_EC_ADAPT
{ 0, 2, 0, 0, 1, AOM_CR_STUDIO_RANGE, AOM_CS_UNKNOWN, { 640, 480 } },
#endif
// TODO(JBB): Test profiles (requires more work).
};
......
......@@ -173,6 +173,10 @@ class AVxEncoderThreadTestLarge : public AVxEncoderThreadTest {};
TEST_P(AVxEncoderThreadTestLarge, EncoderResultTest) { DoTest(); }
#if CONFIG_EC_ADAPT
// TODO(thdavies): EC_ADAPT does not support tiles
#else
AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
......@@ -182,4 +186,5 @@ AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTestLarge,
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
::testing::Range(0, 3));
#endif
} // namespace
......@@ -126,6 +126,9 @@ class TileIndependenceTestLarge : public TileIndependenceTest {
TEST_P(TileIndependenceTestLarge, MD5Match) { DoTest(); }
#if CONFIG_EC_ADAPT
// TODO(thdavies): EC_ADAPT does not support tiles
#else
#if CONFIG_EXT_TILE
AV1_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Values(1, 2, 32),
::testing::Values(1, 2, 32));
......@@ -138,4 +141,5 @@ AV1_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Values(0, 1),
AV1_INSTANTIATE_TEST_CASE(TileIndependenceTestLarge, ::testing::Values(0, 1),
::testing::Values(0, 1));
#endif // CONFIG_EXT_TILE
#endif // CONFIG_EC_ADAPT
} // namespace
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment