EC_ADAPT: disable tests requiring tiles. EC_ADAPT is currently not compatible with tiles. Change-Id: Idd000f0ff23c28e7e4952024eadb55ba0a1da13d
diff --git a/test/encoder_parms_get_to_decoder.cc b/test/encoder_parms_get_to_decoder.cc index 52d68b1..e6bf0be 100644 --- a/test/encoder_parms_get_to_decoder.cc +++ b/test/encoder_parms_get_to_decoder.cc
@@ -49,7 +49,9 @@ { 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). };
diff --git a/test/ethread_test.cc b/test/ethread_test.cc index c72f16d..2685f87 100644 --- a/test/ethread_test.cc +++ b/test/ethread_test.cc
@@ -173,6 +173,10 @@ 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 @@ ::testing::Values(::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood), ::testing::Range(0, 3)); +#endif } // namespace
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc index cbc27d0..57f4a60 100644 --- a/test/tile_independence_test.cc +++ b/test/tile_independence_test.cc
@@ -126,6 +126,9 @@ 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(TileIndependenceTestLarge, ::testing::Values(0, 1), ::testing::Values(0, 1)); #endif // CONFIG_EXT_TILE +#endif // CONFIG_EC_ADAPT } // namespace