summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-10-20 19:13:10 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-10-21 15:19:11 -0400
commit3d908191497d524c6eb1d06b766cc93b9d96c9fe (patch)
treef54d407fa5e6c7fa60dbf8f33ac2583c5577230e
parent293e20df9128444a21b8ac483ee88e96386861c2 (diff)
downloadlibvpx-3d908191497d524c6eb1d06b766cc93b9d96c9fe.tar.gz
vp10: don't make right edge available across tile boundaries.
Change-Id: Ia81cf3858ef6c8d1fd4b1fb2dd9627906081129d
-rw-r--r--vp10/common/reconintra.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index 457dde6a6..2bcab4234 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -708,8 +708,10 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in,
const int mi_col = -xd->mb_to_left_edge >> 6;
const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
const struct macroblockd_plane *const pd = &xd->plane[plane];
+ const int right_available =
+ mi_col + (bw >> !pd->subsampling_x) < xd->tile.mi_col_end;
const int have_right = vp10_has_right(bsize, mi_row, mi_col,
- xd->mb_to_right_edge > 0,
+ right_available,
tx_size, loff, aoff,
pd->subsampling_x);
const int have_bottom = vp10_has_bottom(bsize, mi_row, mi_col,