RD_COST this_rdc;
mi->mode = ZEROMV;
mi->ref_frame[0] = LAST_FRAME;
- mi->ref_frame[1] = NONE;
- set_ref_ptrs(cm, xd, mi->ref_frame[0], NONE);
+ mi->ref_frame[1] = NO_REF_FRAME;
+ set_ref_ptrs(cm, xd, mi->ref_frame[0], NO_REF_FRAME);
mi->mv[0].as_int = 0;
mi->interp_filter = EIGHTTAP;
if (cpi->sf.default_interp_filter == BILINEAR) mi->interp_filter = BILINEAR;
this_rdc = *best_rdc;
mi->mode = ctx_den->best_mode;
mi->ref_frame[0] = ctx_den->best_ref_frame;
- set_ref_ptrs(cm, xd, mi->ref_frame[0], NONE);
+ set_ref_ptrs(cm, xd, mi->ref_frame[0], NO_REF_FRAME);
mi->interp_filter = ctx_den->best_pred_filter;
if (ctx_den->best_ref_frame == INTRA_FRAME) {
mi->mv[0].as_int = INVALID_MV;
bp->best_intra_tx_size = TX_SIZES;
bp->best_pred_filter = EIGHTTAP;
bp->best_mode_skip_txfm = SKIP_TXFM_NONE;
- bp->best_second_ref_frame = NONE;
+ bp->best_second_ref_frame = NO_REF_FRAME;
bp->best_pred = NULL;
}
vp9_rd_cost_reset(&best_rdc);
vp9_rd_cost_reset(rd_cost);
mi->sb_type = bsize;
- mi->ref_frame[0] = NONE;
- mi->ref_frame[1] = NONE;
+ mi->ref_frame[0] = NO_REF_FRAME;
+ mi->ref_frame[1] = NO_REF_FRAME;
mi->tx_size =
VPXMIN(max_txsize_lookup[bsize], tx_mode_to_biggest_tx_size[cm->tx_mode]);
int comp_pred = 0;
int force_mv_inter_layer = 0;
PREDICTION_MODE this_mode;
- second_ref_frame = NONE;
+ second_ref_frame = NO_REF_FRAME;
if (idx < num_inter_modes) {
this_mode = ref_mode_set[idx].pred_mode;
best_pickmode.best_mode = this_mode;
best_pickmode.best_intra_tx_size = mi->tx_size;
best_pickmode.best_ref_frame = INTRA_FRAME;
- best_pickmode.best_second_ref_frame = NONE;
+ best_pickmode.best_second_ref_frame = NO_REF_FRAME;
mi->uv_mode = this_mode;
mi->mv[0].as_int = INVALID_MV;
mi->mv[1].as_int = INVALID_MV;
MODE_INFO *const mi = xd->mi[0];
MB_MODE_INFO_EXT *const mbmi_ext = x->mbmi_ext;
const struct segmentation *const seg = &cm->seg;
- MV_REFERENCE_FRAME ref_frame, second_ref_frame = NONE;
- MV_REFERENCE_FRAME best_ref_frame = NONE;
+ MV_REFERENCE_FRAME ref_frame, second_ref_frame = NO_REF_FRAME;
+ MV_REFERENCE_FRAME best_ref_frame = NO_REF_FRAME;
unsigned char segment_id = mi->segment_id;
struct buf_2d yv12_mb[4][MAX_MB_PLANE];
int64_t best_rd = INT64_MAX;
mi->tx_size = TX_4X4;
mi->uv_mode = DC_PRED;
mi->ref_frame[0] = LAST_FRAME;
- mi->ref_frame[1] = NONE;
+ mi->ref_frame[1] = NO_REF_FRAME;
mi->interp_filter =
cm->interp_filter == SWITCHABLE ? EIGHTTAP : cm->interp_filter;
#if !CONFIG_REALTIME_ONLY
static const MODE_DEFINITION vp9_mode_order[MAX_MODES] = {
- { NEARESTMV, { LAST_FRAME, NONE } },
- { NEARESTMV, { ALTREF_FRAME, NONE } },
- { NEARESTMV, { GOLDEN_FRAME, NONE } },
+ { NEARESTMV, { LAST_FRAME, NO_REF_FRAME } },
+ { NEARESTMV, { ALTREF_FRAME, NO_REF_FRAME } },
+ { NEARESTMV, { GOLDEN_FRAME, NO_REF_FRAME } },
- { DC_PRED, { INTRA_FRAME, NONE } },
+ { DC_PRED, { INTRA_FRAME, NO_REF_FRAME } },
- { NEWMV, { LAST_FRAME, NONE } },
- { NEWMV, { ALTREF_FRAME, NONE } },
- { NEWMV, { GOLDEN_FRAME, NONE } },
+ { NEWMV, { LAST_FRAME, NO_REF_FRAME } },
+ { NEWMV, { ALTREF_FRAME, NO_REF_FRAME } },
+ { NEWMV, { GOLDEN_FRAME, NO_REF_FRAME } },
- { NEARMV, { LAST_FRAME, NONE } },
- { NEARMV, { ALTREF_FRAME, NONE } },
- { NEARMV, { GOLDEN_FRAME, NONE } },
+ { NEARMV, { LAST_FRAME, NO_REF_FRAME } },
+ { NEARMV, { ALTREF_FRAME, NO_REF_FRAME } },
+ { NEARMV, { GOLDEN_FRAME, NO_REF_FRAME } },
- { ZEROMV, { LAST_FRAME, NONE } },
- { ZEROMV, { GOLDEN_FRAME, NONE } },
- { ZEROMV, { ALTREF_FRAME, NONE } },
+ { ZEROMV, { LAST_FRAME, NO_REF_FRAME } },
+ { ZEROMV, { GOLDEN_FRAME, NO_REF_FRAME } },
+ { ZEROMV, { ALTREF_FRAME, NO_REF_FRAME } },
{ NEARESTMV, { LAST_FRAME, ALTREF_FRAME } },
{ NEARESTMV, { GOLDEN_FRAME, ALTREF_FRAME } },
- { TM_PRED, { INTRA_FRAME, NONE } },
+ { TM_PRED, { INTRA_FRAME, NO_REF_FRAME } },
{ NEARMV, { LAST_FRAME, ALTREF_FRAME } },
{ NEWMV, { LAST_FRAME, ALTREF_FRAME } },
{ ZEROMV, { LAST_FRAME, ALTREF_FRAME } },
{ ZEROMV, { GOLDEN_FRAME, ALTREF_FRAME } },
- { H_PRED, { INTRA_FRAME, NONE } },
- { V_PRED, { INTRA_FRAME, NONE } },
- { D135_PRED, { INTRA_FRAME, NONE } },
- { D207_PRED, { INTRA_FRAME, NONE } },
- { D153_PRED, { INTRA_FRAME, NONE } },
- { D63_PRED, { INTRA_FRAME, NONE } },
- { D117_PRED, { INTRA_FRAME, NONE } },
- { D45_PRED, { INTRA_FRAME, NONE } },
+ { H_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { V_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D135_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D207_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D153_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D63_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D117_PRED, { INTRA_FRAME, NO_REF_FRAME } },
+ { D45_PRED, { INTRA_FRAME, NO_REF_FRAME } },
};
static const REF_DEFINITION vp9_ref_order[MAX_REFS] = {
- { { LAST_FRAME, NONE } }, { { GOLDEN_FRAME, NONE } },
- { { ALTREF_FRAME, NONE } }, { { LAST_FRAME, ALTREF_FRAME } },
- { { GOLDEN_FRAME, ALTREF_FRAME } }, { { INTRA_FRAME, NONE } },
+ { { LAST_FRAME, NO_REF_FRAME } }, { { GOLDEN_FRAME, NO_REF_FRAME } },
+ { { ALTREF_FRAME, NO_REF_FRAME } }, { { LAST_FRAME, ALTREF_FRAME } },
+ { { GOLDEN_FRAME, ALTREF_FRAME } }, { { INTRA_FRAME, NO_REF_FRAME } },
};
#endif // !CONFIG_REALTIME_ONLY
const MV_REFERENCE_FRAME ref_frames[2]) {
if ((this_mode == NEARMV || this_mode == NEARESTMV || this_mode == ZEROMV) &&
frame_mv[this_mode][ref_frames[0]].as_int == 0 &&
- (ref_frames[1] == NONE ||
+ (ref_frames[1] == NO_REF_FRAME ||
frame_mv[this_mode][ref_frames[1]].as_int == 0)) {
int rfc = mode_context[ref_frames[0]];
int c1 = cost_mv_ref(cpi, NEARMV, rfc);
if (c2 > c3) return 0;
} else {
assert(this_mode == ZEROMV);
- if (ref_frames[1] == NONE) {
+ if (ref_frames[1] == NO_REF_FRAME) {
if ((c3 >= c2 && frame_mv[NEARESTMV][ref_frames[0]].as_int == 0) ||
(c3 >= c1 && frame_mv[NEARMV][ref_frames[0]].as_int == 0))
return 0;
x->skip_encode = 0;
ctx->skip = 0;
xd->mi[0]->ref_frame[0] = INTRA_FRAME;
- xd->mi[0]->ref_frame[1] = NONE;
+ xd->mi[0]->ref_frame[1] = NO_REF_FRAME;
// Initialize interp_filter here so we do not have to check for inter block
// modes in get_pred_context_switchable_interp()
xd->mi[0]->interp_filter = SWITCHABLE_FILTERS;
ref_frame_skip_mask[0] |= GOLDEN_FRAME_MODE_MASK;
break;
case ALTREF_FRAME: ref_frame_skip_mask[0] |= ALT_REF_MODE_MASK; break;
- case NONE:
+ case NO_REF_FRAME:
case MAX_REF_FRAMES: assert(0 && "Invalid Reference frame"); break;
}
}
MODE_INFO *ref_mi;
int const_motion = 1;
int skip_ref_frame = !cb_partition_search_ctrl;
- MV_REFERENCE_FRAME rf = NONE;
+ MV_REFERENCE_FRAME rf = NO_REF_FRAME;
int_mv ref_mv;
ref_mv.as_int = INVALID_MV;
if ((mi_col - 1) >= tile_info->mi_col_start) {
if (ref_mv.as_int == INVALID_MV) ref_mv = xd->mi[-1]->mv[0];
- if (rf == NONE) rf = xd->mi[-1]->ref_frame[0];
+ if (rf == NO_REF_FRAME) rf = xd->mi[-1]->ref_frame[0];
for (i = 0; i < mi_height; ++i) {
ref_mi = xd->mi[i * xd->mi_stride - 1];
const_motion &= (ref_mv.as_int == ref_mi->mv[0].as_int) &&
mi->mode = ZEROMV;
mi->uv_mode = DC_PRED;
mi->ref_frame[0] = LAST_FRAME;
- mi->ref_frame[1] = NONE;
+ mi->ref_frame[1] = NO_REF_FRAME;
mi->mv[0].as_int = 0;
x->skip = 1;
case ALTREF_FRAME:
ref_frame_skip_mask[0] |= (1 << GOLDEN_FRAME) | (1 << LAST_FRAME);
break;
- case NONE:
+ case NO_REF_FRAME:
case MAX_REF_FRAMES: assert(0 && "Invalid Reference frame"); break;
}
}
mi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int;
}
// If the second reference does not exist, set the corresponding mv to zero.
- if (mi->ref_frame[1] == NONE) {
+ if (mi->ref_frame[1] == NO_REF_FRAME) {
mi->mv[1].as_int = 0;
for (i = 0; i < 4; ++i) {
mi->bmi[i].as_mv[1].as_int = 0;