Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614

This commit is contained in:
trav90 2018-10-18 21:53:44 -05:00 • committed by Roy Tam
commit 992c6637e3
429 changed files with 76047 additions and 40937 deletions

View file

@ -148,6 +148,11 @@ const map_entry block_size_map[] = {
ENUM(BLOCK_64X64),
#if CONFIG_EXT_PARTITION
ENUM(BLOCK_64X128), ENUM(BLOCK_128X64), ENUM(BLOCK_128X128),
#endif
ENUM(BLOCK_4X16), ENUM(BLOCK_16X4), ENUM(BLOCK_8X32),
ENUM(BLOCK_32X8), ENUM(BLOCK_16X64), ENUM(BLOCK_64X16),
#if CONFIG_EXT_PARTITION
ENUM(BLOCK_32X128), ENUM(BLOCK_128X32),
#endif
LAST_ENUM
};
@ -161,8 +166,12 @@ const map_entry tx_size_map[] = {
ENUM(TX_64X64),
#endif
ENUM(TX_4X8), ENUM(TX_8X4), ENUM(TX_8X16), ENUM(TX_16X8),
ENUM(TX_16X32), ENUM(TX_32X16), ENUM(TX_4X16), ENUM(TX_16X4),
ENUM(TX_8X32), ENUM(TX_32X8), LAST_ENUM
ENUM(TX_16X32), ENUM(TX_32X16),
#if CONFIG_TX64X64
ENUM(TX_32X64), ENUM(TX_64X32),
#endif // CONFIG_TX64X64
ENUM(TX_4X16), ENUM(TX_16X4), ENUM(TX_8X32), ENUM(TX_32X8),
LAST_ENUM
};
const map_entry tx_type_map[] = { ENUM(DCT_DCT),
@ -185,52 +194,36 @@ 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),
#if CONFIG_ALT_INTRA
ENUM(SMOOTH_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),
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),
#if CONFIG_EXT_INTER
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(TM_PRED), ENUM(NEARESTMV), ENUM(NEARMV),
ENUM(ZEROMV), ENUM(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), ENUM(INTRA_INVALID), LAST_ENUM
};
#if CONFIG_CFL
const map_entry uv_prediction_mode_map[] = {
ENUM(UV_DC_PRED), ENUM(UV_V_PRED), ENUM(UV_H_PRED),
ENUM(UV_D45_PRED), ENUM(UV_D135_PRED), ENUM(UV_D117_PRED),
ENUM(UV_D153_PRED), ENUM(UV_D207_PRED), ENUM(UV_D63_PRED),
#if CONFIG_ALT_INTRA
ENUM(UV_SMOOTH_PRED),
ENUM(UV_DC_PRED), ENUM(UV_V_PRED),
ENUM(UV_H_PRED), ENUM(UV_D45_PRED),
ENUM(UV_D135_PRED), ENUM(UV_D117_PRED),
ENUM(UV_D153_PRED), ENUM(UV_D207_PRED),
ENUM(UV_D63_PRED), ENUM(UV_SMOOTH_PRED),
#if CONFIG_SMOOTH_HV
ENUM(UV_SMOOTH_V_PRED), ENUM(UV_SMOOTH_H_PRED),
#endif // CONFIG_SMOOTH_HV
#endif // CONFIG_ALT_INTRA
ENUM(UV_TM_PRED), ENUM(UV_MODE_INVALID), LAST_ENUM
ENUM(UV_TM_PRED),
#if CONFIG_CFL
ENUM(UV_CFL_PRED),
#endif
ENUM(UV_MODE_INVALID), LAST_ENUM
};
#else
#define uv_prediction_mode_map prediction_mode_map