Rename above and left offset variables. These variable names were legacy from a previous version of this function and in the current version they were confusingly backwards. Change-Id: I4f6c1628f296fd5b650fd9c5e2d56d7daf66a3f6
diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c index 99c3340..0d38dee 100644 --- a/vp10/common/reconintra.c +++ b/vp10/common/reconintra.c
@@ -1323,12 +1323,12 @@ TX_SIZE tx_size, PREDICTION_MODE mode, const uint8_t *ref, int ref_stride, uint8_t *dst, int dst_stride, - int aoff, int loff, int plane) { + int col_off, int row_off, int plane) { const int txw = (1 << tx_size); - const int have_top = loff || xd->up_available; - const int have_left = aoff || xd->left_available; - const int x = aoff * 4; - const int y = loff * 4; + const int have_top = row_off || xd->up_available; + const int have_left = col_off || xd->left_available; + const int x = col_off * 4; + const int y = row_off * 4; const int bw = VPXMAX(2, 1 << bwl_in); const int bh = VPXMAX(2, 1 << bhl_in); const int mi_row = -xd->mb_to_top_edge >> (3 + MI_SIZE_LOG2); @@ -1339,11 +1339,11 @@ mi_col + (bw >> !pd->subsampling_x) < xd->tile.mi_col_end; const int have_right = vp10_has_right(bsize, mi_row, mi_col, right_available, - tx_size, loff, aoff, + tx_size, row_off, col_off, pd->subsampling_x); const int have_bottom = vp10_has_bottom(bsize, mi_row, mi_col, xd->mb_to_bottom_edge > 0, - tx_size, loff, aoff, + tx_size, row_off, col_off, pd->subsampling_y); const int wpx = 4 * bw; const int hpx = 4 * bh;