Skip to content

GitLab

Commit 6d5d4395 authored by Jingning Han's avatar Jingning Han
Browse files
Options

Replace arbitrary number with defs 

Change-Id: Ia5a68f26c67d13d3f2dd3b3f8afabb781e2c8f73
parent 14a7aada
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
vp10/decoder/decodemv.c
View file @ 6d5d4395
......@@ -1294,7 +1294,7 @@ static void read_inter_frame_mode_info(VP10Decoder *const pbi,
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT &&
!mbmi->skip && inter_block) {
const TX_SIZE max_tx_size = max_txsize_lookup[bsize];
......
vp10/encoder/bitstream.c
View file @ 6d5d4395
......@@ -1306,7 +1306,7 @@ static void write_modes_b(VP10_COMP *cpi, const TileInfo *const tile,
} else {
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
#endif
pack_inter_mode_mvs(cpi, m,
#if CONFIG_SUPERTX
......
vp10/encoder/encodeframe.c
View file @ 6d5d4395
......@@ -233,7 +233,7 @@ static void set_offsets(VP10_COMP *cpi, const TileInfo *const tile,
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
xd->max_tx_size = max_txsize_lookup[bsize];
#endif
......@@ -2260,7 +2260,7 @@ static void rd_use_partition(VP10_COMP *cpi,
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
#endif
pc_tree->partitioning = partition;
save_context(x, mi_row, mi_col, a, l, sa, sl,
......@@ -2586,7 +2586,7 @@ static void rd_use_partition(VP10_COMP *cpi,
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
#endif
restore_context(x, mi_row, mi_col, a, l, sa, sl,
#if CONFIG_VAR_TX
......@@ -2948,7 +2948,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
save_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else
save_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
......@@ -3109,7 +3109,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
}
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
......@@ -3311,7 +3311,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
}
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
......@@ -3442,7 +3442,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
}
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
......@@ -3571,7 +3571,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
}
#if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
......@@ -4244,7 +4244,7 @@ static void tx_partition_count_update(VP10_COMMON *cm,
int idx, idy;
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
for (idy = 0; idy < mi_height; idy += bh)
for (idx = 0; idx < mi_width; idx += bh)
......@@ -4308,7 +4308,7 @@ static void tx_partition_set_contexts(VP10_COMMON *cm,
int idx, idy;
xd->above_txfm_context = cm->above_txfm_context + mi_col;
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & MI_MASK);
for (idy = 0; idy < mi_height; idy += bh)
for (idx = 0; idx < mi_width; idx += bh)
......
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