diff options
Diffstat (limited to 'vp8/common')
-rw-r--r-- | vp8/common/onyxc_int.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 7c6093b41..e3361556f 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -163,10 +163,16 @@ typedef enum { NB_PREDICTION_TYPES = 3, } COMPPREDMODE_TYPE; -/* TODO: allows larger transform */ typedef enum { ONLY_4X4 = 0, - ALLOW_8X8 = 1 + ALLOW_8X8 = 1, +#if CONFIG_TX16X16 + ALLOW_16X16 = 2, +#endif +#if CONFIG_TX_SELECT + TX_MODE_SELECT = 2 + CONFIG_TX16X16, +#endif + NB_TXFM_MODES = 2 + CONFIG_TX16X16 + CONFIG_TX_SELECT, } TXFM_MODE; typedef struct VP8_COMMON_RTCD { @@ -306,6 +312,11 @@ typedef struct VP8Common { vp8_prob prob_comppred[COMP_PRED_CONTEXTS]; +#if CONFIG_TX_SELECT + // FIXME contextualize + vp8_prob prob_tx[TX_SIZE_MAX - 1]; +#endif + vp8_prob mbskip_pred_probs[MBSKIP_CONTEXTS]; FRAME_CONTEXT lfc_a; /* last alt ref entropy */ |