diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-22 21:12:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-22 21:12:25 +0000 |
| commit | de4e2662d774c14d2168b7885044ac8252e6592f (patch) | |
| tree | 195e8d6af7e545035510e40200d83c3474602a21 | |
| parent | 69df584416512c95e74790c49a3abbf0435390a6 (diff) | |
| parent | 3d908191497d524c6eb1d06b766cc93b9d96c9fe (diff) | |
| download | libvpx-de4e2662d774c14d2168b7885044ac8252e6592f.tar.gz | |
Merge "vp10: don't make right edge available across tile boundaries."
| -rw-r--r-- | vp10/common/reconintra.c | 4 |
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, |