diff options
author | Yaowu Xu <yaowu@google.com> | 2012-02-28 17:11:12 -0800 |
---|---|---|
committer | Yaowu Xu <yaowu@google.com> | 2012-03-01 12:59:11 -0800 |
commit | 89ee68b1f719a40f698d5793901da52fb8a3a852 (patch) | |
tree | 2a1326a6a3c914ce8d8b7df85a0ad7d1afed809e /vp8/common/onyxc_int.h | |
parent | 3ceb43104fc379ffed0416e11c256012cc62732a (diff) | |
download | libvpx-89ee68b1f719a40f698d5793901da52fb8a3a852.tar libvpx-89ee68b1f719a40f698d5793901da52fb8a3a852.tar.gz libvpx-89ee68b1f719a40f698d5793901da52fb8a3a852.tar.bz2 libvpx-89ee68b1f719a40f698d5793901da52fb8a3a852.zip |
Merge t8x8 experiments
Change-Id: I8e9b6b154e1a0d0cb42d596366380d69c00ac15f
Diffstat (limited to 'vp8/common/onyxc_int.h')
-rw-r--r-- | vp8/common/onyxc_int.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index a65123b23..535eabb42 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -53,9 +53,7 @@ typedef struct frame_contexts #endif vp8_prob sub_mv_ref_prob [VP8_SUBMVREFS-1]; vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; -#if CONFIG_T8X8 vp8_prob coef_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; -#endif MV_CONTEXT mvc[2]; MV_CONTEXT pre_mvc[2]; /* not to caculate the mvcost for the frame if mvc doesn't change. */ #if CONFIG_HIGH_PRECISION_MV @@ -84,14 +82,12 @@ typedef enum NB_PREDICTION_TYPES = 3, } COMPPREDMODE_TYPE; -#if CONFIG_T8X8 /* TODO: allows larger transform */ typedef enum { ONLY_4X4 = 0, ALLOW_8X8 = 1 } TXFM_MODE; -#endif /* CONFIG_T8X8 */ typedef struct VP8_COMMON_RTCD { @@ -150,9 +146,7 @@ typedef struct VP8Common /* profile settings */ int experimental; int mb_no_coeff_skip; -#if CONFIG_T8X8 TXFM_MODE txfm_mode; -#endif COMPPREDMODE_TYPE comp_pred_mode; int no_lpf; int use_bilinear_mc_filter; |