commit 67a2ff7f9034cd446a6a4ddbe32f47afc9d1c93d
author Geza Lore <gezalore@gmail.com> Tue May 03 11:53:55 2016 +0100
committer Geza Lore <gezalore@gmail.com> Tue May 03 19:02:11 2016 +0100
tree c7daddf902d575668ff46a7beb8271975904895e
parent 47af3efc6ea63fb3c5d4bdae98deb836feb88cdb

Configure tiles in tests when using ext-tile.

With ext-tile enabled, the encoder test driver needs to configure the
tile sizes wit different values to encode using a single tile, and to
decode all tiles. This should fix most unit test failures.

Change-Id: I0a0d26737414669791f3bd8d80c537db09f06072

test/encode_test_driver.cc

diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index 128436e..3de952c 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -45,11 +45,14 @@
 #endif
 #if CONFIG_VP10_ENCODER
     if (CodecInterface() == &vpx_codec_vp10_cx_algo) {
-      // Default to 1 tile column for VP10.
+      // Default to 1 tile column for VP10. With CONFIG_EXT_TILE, the
+      // default is already the largest possible tile size
+#if !CONFIG_EXT_TILE
       const int log2_tile_columns = 0;
       res = vpx_codec_control_(&encoder_, VP9E_SET_TILE_COLUMNS,
                                log2_tile_columns);
       ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
+#endif  // !CONFIG_EXT_TILE
     } else
 #endif
     {
@@ -175,6 +178,12 @@
 void EncoderTest::RunLoop(VideoSource *video) {
   vpx_codec_dec_cfg_t dec_cfg = vpx_codec_dec_cfg_t();
 
+#if CONFIG_EXT_TILE
+  // Decode all tiles.
+  dec_cfg.tile_col = -1;
+  dec_cfg.tile_row = -1;
+#endif  // CONFIG_EXT_TILE
+
   stats_.Reset();
 
   ASSERT_TRUE(passes_ == 1 || passes_ == 2);

test/svc_test.cc

diff --git a/test/svc_test.cc b/test/svc_test.cc
index b955cee..e573e10 100644
--- a/test/svc_test.cc
+++ b/test/svc_test.cc
@@ -61,6 +61,10 @@
     codec_enc_.kf_max_dist = 100;
 
     vpx_codec_dec_cfg_t dec_cfg = vpx_codec_dec_cfg_t();
+#if CONFIG_EXT_TILE
+    dec_cfg.tile_col = -1;
+    dec_cfg.tile_row = -1;
+#endif  // CONFIG_EXT_TILE
     VP9CodecFactory codec_factory;
     decoder_ = codec_factory.CreateDecoder(dec_cfg, 0);
 

test/tile_independence_test.cc

diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index e074461..6ef9cf5 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -33,6 +33,10 @@
     cfg.w = 704;
     cfg.h = 144;
     cfg.threads = 1;
+#if CONFIG_EXT_TILE
+    cfg.tile_col = -1;
+    cfg.tile_row = -1;
+#endif  // CONFIG_EXT_TILE
     fw_dec_ = codec_->CreateDecoder(cfg, 0);
     inv_dec_ = codec_->CreateDecoder(cfg, 0);
     inv_dec_->Control(VP9_INVERT_TILE_DECODE_ORDER, 1);
@@ -104,5 +108,9 @@
 
 VP9_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Range(0, 2, 1));
 
+#if CONFIG_EXT_TILE
+VP10_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Values(1, 2, 32));
+#else
 VP10_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Range(0, 1, 1));
+#endif  // CONFIG_EXT_TILE
 }  // namespace

test/vp9_ethread_test.cc

diff --git a/test/vp9_ethread_test.cc b/test/vp9_ethread_test.cc
index 3445bf2..783caeb 100644
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -32,6 +32,10 @@
     vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();
     cfg.w = 1280;
     cfg.h = 720;
+#if CONFIG_EXT_TILE
+    cfg.tile_col = -1;
+    cfg.tile_row = -1;
+#endif  // CONFIG_EXT_TILE
     decoder_ = codec_->CreateDecoder(cfg, 0);
 
     md5_.clear();