diff options
| author | Daniel Kang <ddkang@google.com> | 2012-08-03 10:22:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-03 10:22:04 -0700 |
| commit | e6de9c2e5ddfe36324fbbb4f57971245066a32cf (patch) | |
| tree | 2b0823f1626d464a1dbcda1e958dd6a556889f57 /vp8/common/onyxc_int.h | |
| parent | 4aabfaa5d03501ff6887039425d578a08ab3a010 (diff) | |
| parent | fed8a1837fd6b1e4e36495be8210bd63bfb2bb8f (diff) | |
| download | libvpx-e6de9c2e5ddfe36324fbbb4f57971245066a32cf.tar libvpx-e6de9c2e5ddfe36324fbbb4f57971245066a32cf.tar.gz libvpx-e6de9c2e5ddfe36324fbbb4f57971245066a32cf.tar.bz2 libvpx-e6de9c2e5ddfe36324fbbb4f57971245066a32cf.zip | |
Merge "16x16 DCT blocks." into experimental
Diffstat (limited to 'vp8/common/onyxc_int.h')
| -rw-r--r-- | vp8/common/onyxc_int.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index ccecc4963..89d437ba5 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -52,6 +52,9 @@ typedef struct frame_contexts { vp8_prob mbsplit_prob [VP8_NUMMBSPLITS - 1]; vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; vp8_prob coef_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; +#if CONFIG_TX16X16 + vp8_prob coef_probs_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; +#endif MV_CONTEXT mvc[2]; #if CONFIG_HIGH_PRECISION_MV MV_CONTEXT_HP mvc_hp[2]; @@ -73,12 +76,22 @@ typedef struct frame_contexts { unsigned int sub_mv_ref_counts [SUBMVREF_COUNT][VP8_SUBMVREFS]; unsigned int mbsplit_counts [VP8_NUMMBSPLITS]; - vp8_prob pre_coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; - vp8_prob pre_coef_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; + vp8_prob pre_coef_probs [BLOCK_TYPES] [COEF_BANDS] + [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; + vp8_prob pre_coef_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] + [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; +#if CONFIG_TX16X16 + vp8_prob pre_coef_probs_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] + [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; +#endif unsigned int coef_counts [BLOCK_TYPES] [COEF_BANDS] - [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; + [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; unsigned int coef_counts_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] - [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; + [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; +#if CONFIG_TX16X16 + unsigned int coef_counts_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] + [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; +#endif unsigned int MVcount [2] [MVvals]; #if CONFIG_HIGH_PRECISION_MV unsigned int MVcount_hp [2] [MVvals_hp]; |