Always respect tile bounds in calc_target_weighted_pred.

The tile boundaries should now be respected even between tile rows.
regardless of whether ext-tile is used or not.

Change-Id: I5a39fd274451114a4264215f97f12be2c908016d

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 80132a1edece821338c3ab93782b8e07ba193bbb..5541b140d27ce61d6526a2ad9ddebb48cad9e07b 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -11063,7 +11063,6 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
                                uint8_t *left_buf,  int left_stride,
                                int *mask_buf, int mask_stride,
                                int *weighted_src_buf, int weighted_src_stride) {
-  const TileInfo *const tile = &xd->tile;
   BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   int row, col, i, mi_step;
   int bw = 8 * xd->n8_w;
@@ -11084,11 +11083,7 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
   }
 
   // handle above row
-#if CONFIG_EXT_TILE
-  if (mi_row > 0 && (mi_row - 1 >= tile->mi_row_start)) {
-#else
-  if (mi_row > 0) {
-#endif  // CONFIG_EXT_TILE
+  if (xd->up_available) {
     for (i = 0; i < VPXMIN(xd->n8_w, cm->mi_cols - mi_col); i += mi_step) {
       int mi_row_offset = -1;
       int mi_col_offset = i;
@@ -11157,7 +11152,7 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
     mask2d += mask_stride;
   }
 
-  if (mi_col > 0 && (mi_col - 1 >= tile->mi_col_start)) {
+  if (xd->left_available) {
     for (i = 0; i < VPXMIN(xd->n8_h, cm->mi_rows - mi_row); i += mi_step) {
       int mi_row_offset = i;
       int mi_col_offset = -1;