VP9: Eliminate up_available and left_available

Use above_mi and left_mi instead.

Change-Id: I0b50e232c31d11da30aa2fb6f91a695aaf725e0c
This commit is contained in:
Scott LaVarnway
2016-03-30 04:47:39 -07:00
parent aea8d97a74
commit ba962a5f37
10 changed files with 56 additions and 55 deletions

View File

@@ -1017,8 +1017,8 @@ void vp9_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *rd_cost,
tx_mode_to_biggest_tx_size[cpi->common.tx_mode]);
MODE_INFO *const mic = xd->mi[0];
int *bmode_costs;
const MODE_INFO *above_mi = xd->mi[-xd->mi_stride];
const MODE_INFO *left_mi = xd->left_available ? xd->mi[-1] : NULL;
const MODE_INFO *above_mi = xd->above_mi;
const MODE_INFO *left_mi = xd->left_mi;
const PREDICTION_MODE A = vp9_above_block_mode(mic, above_mi, 0);
const PREDICTION_MODE L = vp9_left_block_mode(mic, left_mi, 0);
bmode_costs = cpi->y_mode_costs[A][L];
@@ -1242,10 +1242,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH;
x->skip = 0;
if (xd->up_available)
filter_ref = xd->mi[-xd->mi_stride]->interp_filter;
else if (xd->left_available)
filter_ref = xd->mi[-1]->interp_filter;
if (xd->above_mi)
filter_ref = xd->above_mi->interp_filter;
else if (xd->left_mi)
filter_ref = xd->left_mi->interp_filter;
else
filter_ref = cm->interp_filter;