Configure tiles in tests when using row-tile.

With row-tile enabled, the encoder test driver needs to configure the
decoder in order to decode all tiles correctly.

Change-Id: I8b00a766cf5e41255625846f92fd71915c614ec1

diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index 83a909727e1436bc3abb6d378cb7df3b41fa7b2f..6d2d0e062bc3f69eac3ef6e3c56b80b998b030fd 100644 (file)
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -142,6 +142,12 @@ void EncoderTest::MismatchHook(const vpx_image_t* /*img1*/,
 void EncoderTest::RunLoop(VideoSource *video) {
   vpx_codec_dec_cfg_t dec_cfg = vpx_codec_dec_cfg_t();
 
+#if CONFIG_ROW_TILE
+  // Decode all tiles.
+  dec_cfg.tile_col = -1;
+  dec_cfg.tile_row = -1;
+#endif  // CONFIG_ROW_TILE
+
   stats_.Reset();
 
   ASSERT_TRUE(passes_ == 1 || passes_ == 2);

diff --git a/vp9/common/vp9_motion_model.c b/vp9/common/vp9_motion_model.c
index 7547bce683e0392ad15f4eef8252a1fd7167747f..285576014e824f3ba0c35912a20ff109b01f1fa2 100644 (file)
--- a/vp9/common/vp9_motion_model.c
+++ b/vp9/common/vp9_motion_model.c
@@ -226,11 +226,11 @@ double compute_warp_and_error(Global_Motion_Params *gm,
                             int subsampling_col, int subsampling_row,
                             int x_scale, int y_scale) {
   double H[9];
-  vp9_convert_params_to_rotzoom(gm, H);
   int i, j;
   int64_t sumerr = 0;
   if (projectPoints == NULL)
     return -1;
+  vp9_convert_params_to_rotzoom(gm, H);
   for (i = p_row; i < p_row + p_height; ++i) {
     for (j = p_col; j < p_col + p_width; ++j) {
       double in[2], out[2];