Commit b9f68d27 authored by Sarah Parker's avatar Sarah Parker

Remove references to deleted ext-inter modes

This allows the av1 analyzer to work for ext-inter experiments

Change-Id: I9f86740f051f7db632a8f7dbe63be66ce89ff3a8
parent 5e606544
......@@ -185,31 +185,39 @@ const map_entry tx_type_map[] = { ENUM(DCT_DCT),
#endif
LAST_ENUM };
const map_entry prediction_mode_map[] = {
ENUM(DC_PRED), ENUM(V_PRED),
ENUM(H_PRED), ENUM(D45_PRED),
ENUM(D135_PRED), ENUM(D117_PRED),
ENUM(D153_PRED), ENUM(D207_PRED),
ENUM(D63_PRED),
const map_entry prediction_mode_map[] = { ENUM(DC_PRED),
ENUM(V_PRED),
ENUM(H_PRED),
ENUM(D45_PRED),
ENUM(D135_PRED),
ENUM(D117_PRED),
ENUM(D153_PRED),
ENUM(D207_PRED),
ENUM(D63_PRED),
#if CONFIG_ALT_INTRA
ENUM(SMOOTH_PRED),
ENUM(SMOOTH_PRED),
#if CONFIG_SMOOTH_HV
ENUM(SMOOTH_V_PRED), ENUM(SMOOTH_H_PRED),
ENUM(SMOOTH_V_PRED),
ENUM(SMOOTH_H_PRED),
#endif // CONFIG_SMOOTH_HV
#endif // CONFIG_ALT_INTRA
ENUM(TM_PRED), ENUM(NEARESTMV),
ENUM(NEARMV), ENUM(ZEROMV),
ENUM(NEWMV),
ENUM(TM_PRED),
ENUM(NEARESTMV),
ENUM(NEARMV),
ENUM(ZEROMV),
ENUM(NEWMV),
#if CONFIG_EXT_INTER
ENUM(NEWFROMNEARMV), ENUM(NEAREST_NEARESTMV),
ENUM(NEAREST_NEARMV), ENUM(NEAR_NEARESTMV),
ENUM(NEAR_NEARMV), ENUM(NEAREST_NEWMV),
ENUM(NEW_NEARESTMV), ENUM(NEAR_NEWMV),
ENUM(NEW_NEARMV), ENUM(ZERO_ZEROMV),
ENUM(NEW_NEWMV),
ENUM(NEAREST_NEARESTMV),
ENUM(NEAR_NEARMV),
ENUM(NEAREST_NEWMV),
ENUM(NEW_NEARESTMV),
ENUM(NEAR_NEWMV),
ENUM(NEW_NEARMV),
ENUM(ZERO_ZEROMV),
ENUM(NEW_NEWMV),
#endif
ENUM(INTRA_INVALID), LAST_ENUM
};
ENUM(INTRA_INVALID),
LAST_ENUM };
#define NO_SKIP 0
#define SKIP 1
......
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