Commit de4e2662 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review

Merge "vp10: don't make right edge available across tile boundaries."

parents 69df5844 3d908191
...@@ -708,8 +708,10 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in, ...@@ -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 int mi_col = -xd->mb_to_left_edge >> 6;
const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type; const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
const struct macroblockd_plane *const pd = &xd->plane[plane]; 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, const int have_right = vp10_has_right(bsize, mi_row, mi_col,
xd->mb_to_right_edge > 0, right_available,
tx_size, loff, aoff, tx_size, loff, aoff,
pd->subsampling_x); pd->subsampling_x);
const int have_bottom = vp10_has_bottom(bsize, mi_row, mi_col, const int have_bottom = vp10_has_bottom(bsize, mi_row, mi_col,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment