Rename NONE to NONE_FRAME.
This follows the naming for the other frame types, and allows libaom
to be compiled against other libraries that also #define NONE.
Change-Id: Ic2e2814587bbc5ea67385a9af775396d29b7dde0
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index c6b9f85..55cbcaa 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -898,7 +898,7 @@
av1_setup_pre_planes(xd, 0, yv12, mi_row, mi_col,
&cm->frame_refs[LAST_FRAME - 1].sf);
mbmi->ref_frame[0] = LAST_FRAME;
- mbmi->ref_frame[1] = NONE;
+ mbmi->ref_frame[1] = NONE_FRAME;
mbmi->sb_type = cm->sb_size;
mbmi->mv[0].as_int = 0;
#if CONFIG_DUAL_FILTER
@@ -981,7 +981,7 @@
int dir;
for (dir = 0; dir < 2; ++dir) {
if (!has_subpel_mv_component(xd->mi[0], xd, dir) &&
- (mbmi->ref_frame[1] == NONE ||
+ (mbmi->ref_frame[1] == NONE_FRAME ||
!has_subpel_mv_component(xd->mi[0], xd, dir + 2)))
mbmi->interp_filter[dir] = (cm->interp_filter == SWITCHABLE)
? EIGHTTAP_REGULAR
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index c545eab..3434d86 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2674,7 +2674,7 @@
static YV12_BUFFER_CONFIG *get_av1_ref_frame_buffer(
AV1_COMP *cpi, AOM_REFFRAME ref_frame_flag) {
- MV_REFERENCE_FRAME ref_frame = NONE;
+ MV_REFERENCE_FRAME ref_frame = NONE_FRAME;
if (ref_frame_flag == AOM_LAST_FLAG) ref_frame = LAST_FRAME;
#if CONFIG_EXT_REFS
else if (ref_frame_flag == AOM_LAST2_FLAG)
@@ -2691,7 +2691,7 @@
else if (ref_frame_flag == AOM_ALT_FLAG)
ref_frame = ALTREF_FRAME;
- return ref_frame == NONE ? NULL : get_ref_frame_buffer(cpi, ref_frame);
+ return ref_frame == NONE_FRAME ? NULL : get_ref_frame_buffer(cpi, ref_frame);
}
int av1_copy_reference_enc(AV1_COMP *cpi, AOM_REFFRAME ref_frame_flag,
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 9971c66..32f1c5d 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -866,7 +866,7 @@
xd->mi[0]->mbmi.mv[0].as_mv = mv;
xd->mi[0]->mbmi.tx_size = TX_4X4;
xd->mi[0]->mbmi.ref_frame[0] = LAST_FRAME;
- xd->mi[0]->mbmi.ref_frame[1] = NONE;
+ xd->mi[0]->mbmi.ref_frame[1] = NONE_FRAME;
av1_build_inter_predictors_sby(xd, mb_row * mb_scale,
mb_col * mb_scale, NULL, bsize);
av1_encode_sby_pass1(cm, x, bsize);
diff --git a/av1/encoder/mbgraph.c b/av1/encoder/mbgraph.c
index 1f63222..52974e2 100644
--- a/av1/encoder/mbgraph.c
+++ b/av1/encoder/mbgraph.c
@@ -71,7 +71,7 @@
xd->mi[0]->mbmi.mv[0] = x->best_mv;
#if CONFIG_EXT_INTER
- xd->mi[0]->mbmi.ref_frame[1] = NONE;
+ xd->mi[0]->mbmi.ref_frame[1] = NONE_FRAME;
#endif // CONFIG_EXT_INTER
av1_build_inter_predictors_sby(xd, mb_row, mb_col, NULL, BLOCK_16X16);
@@ -246,7 +246,7 @@
xd->mi[0] = &mi_local;
mi_local.mbmi.sb_type = BLOCK_16X16;
mi_local.mbmi.ref_frame[0] = LAST_FRAME;
- mi_local.mbmi.ref_frame[1] = NONE;
+ mi_local.mbmi.ref_frame[1] = NONE_FRAME;
for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
MV gld_left_mv = gld_top_mv;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index da412fb..d2e9950 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -138,54 +138,54 @@
#define LAST_NEW_MV_INDEX 6
static const MODE_DEFINITION av1_mode_order[MAX_MODES] = {
- { NEARESTMV, { LAST_FRAME, NONE } },
+ { NEARESTMV, { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { NEARESTMV, { LAST2_FRAME, NONE } },
- { NEARESTMV, { LAST3_FRAME, NONE } },
- { NEARESTMV, { BWDREF_FRAME, NONE } },
+ { NEARESTMV, { LAST2_FRAME, NONE_FRAME } },
+ { NEARESTMV, { LAST3_FRAME, NONE_FRAME } },
+ { NEARESTMV, { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { NEARESTMV, { ALTREF_FRAME, NONE } },
- { NEARESTMV, { GOLDEN_FRAME, NONE } },
+ { NEARESTMV, { ALTREF_FRAME, NONE_FRAME } },
+ { NEARESTMV, { GOLDEN_FRAME, NONE_FRAME } },
- { DC_PRED, { INTRA_FRAME, NONE } },
+ { DC_PRED, { INTRA_FRAME, NONE_FRAME } },
- { NEWMV, { LAST_FRAME, NONE } },
+ { NEWMV, { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { NEWMV, { LAST2_FRAME, NONE } },
- { NEWMV, { LAST3_FRAME, NONE } },
- { NEWMV, { BWDREF_FRAME, NONE } },
+ { NEWMV, { LAST2_FRAME, NONE_FRAME } },
+ { NEWMV, { LAST3_FRAME, NONE_FRAME } },
+ { NEWMV, { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { NEWMV, { ALTREF_FRAME, NONE } },
- { NEWMV, { GOLDEN_FRAME, NONE } },
+ { NEWMV, { ALTREF_FRAME, NONE_FRAME } },
+ { NEWMV, { GOLDEN_FRAME, NONE_FRAME } },
- { NEARMV, { LAST_FRAME, NONE } },
+ { NEARMV, { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { NEARMV, { LAST2_FRAME, NONE } },
- { NEARMV, { LAST3_FRAME, NONE } },
- { NEARMV, { BWDREF_FRAME, NONE } },
+ { NEARMV, { LAST2_FRAME, NONE_FRAME } },
+ { NEARMV, { LAST3_FRAME, NONE_FRAME } },
+ { NEARMV, { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { NEARMV, { ALTREF_FRAME, NONE } },
- { NEARMV, { GOLDEN_FRAME, NONE } },
+ { NEARMV, { ALTREF_FRAME, NONE_FRAME } },
+ { NEARMV, { GOLDEN_FRAME, NONE_FRAME } },
#if CONFIG_EXT_INTER
- { NEWFROMNEARMV, { LAST_FRAME, NONE } },
+ { NEWFROMNEARMV, { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { NEWFROMNEARMV, { LAST2_FRAME, NONE } },
- { NEWFROMNEARMV, { LAST3_FRAME, NONE } },
- { NEWFROMNEARMV, { BWDREF_FRAME, NONE } },
+ { NEWFROMNEARMV, { LAST2_FRAME, NONE_FRAME } },
+ { NEWFROMNEARMV, { LAST3_FRAME, NONE_FRAME } },
+ { NEWFROMNEARMV, { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { NEWFROMNEARMV, { ALTREF_FRAME, NONE } },
- { NEWFROMNEARMV, { GOLDEN_FRAME, NONE } },
+ { NEWFROMNEARMV, { ALTREF_FRAME, NONE_FRAME } },
+ { NEWFROMNEARMV, { GOLDEN_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_INTER
- { ZEROMV, { LAST_FRAME, NONE } },
+ { ZEROMV, { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { ZEROMV, { LAST2_FRAME, NONE } },
- { ZEROMV, { LAST3_FRAME, NONE } },
- { ZEROMV, { BWDREF_FRAME, NONE } },
+ { ZEROMV, { LAST2_FRAME, NONE_FRAME } },
+ { ZEROMV, { LAST3_FRAME, NONE_FRAME } },
+ { ZEROMV, { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { ZEROMV, { GOLDEN_FRAME, NONE } },
- { ZEROMV, { ALTREF_FRAME, NONE } },
+ { ZEROMV, { GOLDEN_FRAME, NONE_FRAME } },
+ { ZEROMV, { ALTREF_FRAME, NONE_FRAME } },
// TODO(zoeliu): May need to reconsider the order on the modes to check
@@ -219,10 +219,10 @@
#endif // CONFIG_EXT_REFS
#endif // CONFIG_EXT_INTER
- { TM_PRED, { INTRA_FRAME, NONE } },
+ { TM_PRED, { INTRA_FRAME, NONE_FRAME } },
#if CONFIG_ALT_INTRA
- { SMOOTH_PRED, { INTRA_FRAME, NONE } },
+ { SMOOTH_PRED, { INTRA_FRAME, NONE_FRAME } },
#endif // CONFIG_ALT_INTRA
#if CONFIG_EXT_INTER
@@ -350,14 +350,14 @@
#endif // CONFIG_EXT_INTER
- { 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, NONE_FRAME } },
+ { V_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D135_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D207_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D153_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D63_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D117_PRED, { INTRA_FRAME, NONE_FRAME } },
+ { D45_PRED, { INTRA_FRAME, NONE_FRAME } },
#if CONFIG_EXT_INTER
{ ZEROMV, { LAST_FRAME, INTRA_FRAME } },
@@ -397,12 +397,12 @@
};
static const REF_DEFINITION av1_ref_order[MAX_REFS] = {
- { { LAST_FRAME, NONE } },
+ { { LAST_FRAME, NONE_FRAME } },
#if CONFIG_EXT_REFS
- { { LAST2_FRAME, NONE } }, { { LAST3_FRAME, NONE } },
- { { BWDREF_FRAME, NONE } },
+ { { LAST2_FRAME, NONE_FRAME } }, { { LAST3_FRAME, NONE_FRAME } },
+ { { BWDREF_FRAME, NONE_FRAME } },
#endif // CONFIG_EXT_REFS
- { { GOLDEN_FRAME, NONE } }, { { ALTREF_FRAME, NONE } },
+ { { GOLDEN_FRAME, NONE_FRAME } }, { { ALTREF_FRAME, NONE_FRAME } },
{ { LAST_FRAME, ALTREF_FRAME } },
#if CONFIG_EXT_REFS
@@ -415,7 +415,7 @@
{ { LAST3_FRAME, BWDREF_FRAME } }, { { GOLDEN_FRAME, BWDREF_FRAME } },
#endif // CONFIG_EXT_REFS
- { { INTRA_FRAME, NONE } },
+ { { INTRA_FRAME, NONE_FRAME } },
};
#if CONFIG_EXT_INTRA || CONFIG_FILTER_INTRA || CONFIG_PALETTE
@@ -8338,7 +8338,7 @@
#endif // CONFIG_AOM_HIGHBITDEPTH
intrapred = intrapred_;
- mbmi->ref_frame[1] = NONE;
+ mbmi->ref_frame[1] = NONE_FRAME;
for (j = 0; j < MAX_MB_PLANE; j++) {
xd->plane[j].dst.buf = tmp_buf + j * MAX_SB_SQUARE;
xd->plane[j].dst.stride = bw;
@@ -8866,7 +8866,7 @@
ctx->skip = 0;
xd->mi[0]->mbmi.ref_frame[0] = INTRA_FRAME;
- xd->mi[0]->mbmi.ref_frame[1] = NONE;
+ xd->mi[0]->mbmi.ref_frame[1] = NONE_FRAME;
if (bsize >= BLOCK_8X8 || unify_bsize) {
if (rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, &dist_y,
@@ -9067,7 +9067,7 @@
mbmi->mode = DC_PRED;
mbmi->uv_mode = DC_PRED;
mbmi->ref_frame[0] = INTRA_FRAME;
- mbmi->ref_frame[1] = NONE;
+ mbmi->ref_frame[1] = NONE_FRAME;
if (!rd_pick_filter_intra_sby(cpi, x, &rate_dummy, &rate_y, &distortion_y,
&skippable, bsize, intra_mode_cost[mbmi->mode],
&this_rd, 0)) {
@@ -9694,7 +9694,7 @@
ref_frame_skip_mask[1] |= SECOND_REF_FRAME_MASK;
#endif // CONFIG_EXT_REFS
break;
- case NONE:
+ case NONE_FRAME:
case TOTAL_REFS_PER_FRAME:
assert(0 && "Invalid Reference frame");
break;
@@ -10327,7 +10327,7 @@
best_intra_mode = mbmi->mode;
}
#if CONFIG_EXT_INTER
- } else if (second_ref_frame == NONE) {
+ } else if (second_ref_frame == NONE_FRAME) {
if (this_rd < best_single_inter_rd) {
best_single_inter_rd = this_rd;
best_single_inter_ref = mbmi->ref_frame[0];
@@ -10564,7 +10564,7 @@
mbmi->mode = DC_PRED;
mbmi->uv_mode = DC_PRED;
mbmi->ref_frame[0] = INTRA_FRAME;
- mbmi->ref_frame[1] = NONE;
+ mbmi->ref_frame[1] = NONE_FRAME;
rate_overhead_palette = rd_pick_palette_intra_sby(
cpi, x, bsize, palette_ctx, intra_mode_cost[DC_PRED], &mbmi_dummy,
best_palette_color_map, &dummy_rd, NULL, NULL, NULL, NULL);
@@ -10847,7 +10847,7 @@
#if CONFIG_EXT_INTER
(best_mbmode.ref_frame[1] <= INTRA_FRAME)
#else
- (best_mbmode.ref_frame[1] == NONE ||
+ (best_mbmode.ref_frame[1] == NONE_FRAME ||
best_mbmode.mv[1].as_int == zeromv[1].as_int)
#endif // CONFIG_EXT_INTER
) {
@@ -10966,7 +10966,7 @@
mbmi->motion_mode = SIMPLE_TRANSLATION;
mbmi->uv_mode = DC_PRED;
mbmi->ref_frame[0] = LAST_FRAME;
- mbmi->ref_frame[1] = NONE;
+ mbmi->ref_frame[1] = NONE_FRAME;
#if CONFIG_GLOBAL_MOTION
mbmi->mv[0].as_int =
gm_get_motion_vector(&cm->global_motion[mbmi->ref_frame[0]],
@@ -11279,7 +11279,7 @@
ref_frame_skip_mask[1] |= (1 << BWDREF_FRAME) | 0x01;
#endif // CONFIG_EXT_REFS
break;
- case NONE:
+ case NONE_FRAME:
case TOTAL_REFS_PER_FRAME:
assert(0 && "Invalid Reference frame");
break;
