generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Replace arbitrary number with defs" into nextgenv2

Browse Source
This commit is contained in:
Jingning Han
2016-02-10 16:50:04 +00:00
committed by Gerrit Code Review
parent 260da6ca8d 6d5d4395b5
commit 32a6a55b66
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp10/decoder/decodemv.c
View File

@@ -1324,7 +1324,7 @@ static void read_inter_frame_mode_info(VP10Decoder *const pbi,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 && if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT &&
!mbmi->skip && inter_block) { !mbmi->skip && inter_block) {
const TX_SIZE max_tx_size = max_txsize_lookup[bsize]; const TX_SIZE max_tx_size = max_txsize_lookup[bsize];

2
vp10/encoder/bitstream.c
View File

@@ -1326,7 +1326,7 @@ static void write_modes_b(VP10_COMP *cpi, const TileInfo *const tile,
} else { } else {
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 #endif
pack_inter_mode_mvs(cpi, m, pack_inter_mode_mvs(cpi, m,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX

20
vp10/encoder/encodeframe.c
View File

@@ -233,7 +233,7 @@ static void set_offsets(VP10_COMP *cpi, const TileInfo *const tile,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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]; xd->max_tx_size = max_txsize_lookup[bsize];
#endif #endif
@@ -2282,7 +2282,7 @@ static void rd_use_partition(VP10_COMP *cpi,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 #endif
pc_tree->partitioning = partition; pc_tree->partitioning = partition;
save_context(x, mi_row, mi_col, a, l, sa, sl, save_context(x, mi_row, mi_col, a, l, sa, sl,
@@ -2608,7 +2608,7 @@ static void rd_use_partition(VP10_COMP *cpi,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 #endif
restore_context(x, mi_row, mi_col, a, l, sa, sl, restore_context(x, mi_row, mi_col, a, l, sa, sl,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
@@ -2970,7 +2970,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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); save_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else #else
save_context(x, mi_row, mi_col, a, l, sa, sl, bsize); save_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
@@ -3131,7 +3131,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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); restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else #else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize); restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
@@ -3333,7 +3333,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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); restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else #else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize); restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
@@ -3464,7 +3464,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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); restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else #else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize); restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
@@ -3593,7 +3593,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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); restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
#else #else
restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize); restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);
@@ -4266,7 +4266,7 @@ static void tx_partition_count_update(VP10_COMMON *cm,
int idx, idy; int idx, idy;
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 (idy = 0; idy < mi_height; idy += bh)
for (idx = 0; idx < mi_width; idx += bh) for (idx = 0; idx < mi_width; idx += bh)
@@ -4330,7 +4330,7 @@ static void tx_partition_set_contexts(VP10_COMMON *cm,
int idx, idy; int idx, idy;
xd->above_txfm_context = cm->above_txfm_context + mi_col; 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 (idy = 0; idy < mi_height; idy += bh)
for (idx = 0; idx < mi_width; idx += bh) for (idx = 0; idx < mi_width; idx += bh)