EC_ADAPT: re-enable tests using tiles.
BUG=aomedia:71
Change-Id: Ie6fafd716fc0419cd170771d51eafa9a915cd790
diff --git a/test/encoder_parms_get_to_decoder.cc b/test/encoder_parms_get_to_decoder.cc
index 23f169d..8d8e2b2 100644
--- a/test/encoder_parms_get_to_decoder.cc
+++ b/test/encoder_parms_get_to_decoder.cc
@@ -49,9 +49,7 @@
{ 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 24d670d..c247b01 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -175,10 +175,6 @@
TEST_P(AVxEncoderThreadTestLarge, EncoderResultTest) { DoTest(); }
-#if CONFIG_EC_ADAPT
-// TODO(thdavies): EC_ADAPT does not support tiles
-
-#else
// For AV1, only test speed 0 to 3.
AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
::testing::Values(::libaom_test::kTwoPassGood,
@@ -189,5 +185,4 @@
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
::testing::Range(0, 2));
-#endif
} // namespace
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index 5f0e5ad..f6ad7c9 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -129,9 +129,6 @@
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));
@@ -144,5 +141,4 @@
AV1_INSTANTIATE_TEST_CASE(TileIndependenceTestLarge, ::testing::Values(0, 1),
::testing::Values(0, 1));
#endif // CONFIG_EXT_TILE
-#endif // CONFIG_EC_ADAPT
} // namespace
