Commit eb690040 authored by Thomas Davies's avatar Thomas Davies

EC_ADAPT: disable tests requiring tiles.

EC_ADAPT is currently not compatible with tiles.

Change-Id: Idd000f0ff23c28e7e4952024eadb55ba0a1da13d
parent 0929da52
......@@ -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).
};
......
......@@ -119,9 +119,20 @@ TEST_P(AVxEncoderThreadTest, EncoderResultTest) {
// Compare to check if two vectors are equal.
ASSERT_EQ(single_thr_md5, multi_thr_md5);
}
#if CONFIG_EC_ADAPT
// TODO(thdavies): EC_ADAPT does not support tiles
INSTANTIATE_TEST_CASE_P(
DISABLED_AV1, AVxEncoderThreadTest,
::testing::Combine(
::testing::Values(
static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
::testing::Range(1, 3)));
#else
AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
::testing::Range(1, 3));
#endif
} // namespace
......@@ -100,7 +100,16 @@ TEST_P(TileIndependenceTest, MD5Match) {
// a MD5...
ASSERT_STREQ(md5_fw_str, md5_inv_str);
}
#if CONFIG_EC_ADAPT
// TODO(thdavies): EC_ADAPT does not support tiles
INSTANTIATE_TEST_CASE_P(
DISABLED_AV1, TileIndependenceTest,
::testing::Combine(
::testing::Values(
static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
::testing::Range(0, 2, 1)));
#else
AV1_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Range(0, 2, 1));
#endif
} // 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