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/encoder/onyx_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/encoder/onyx_int.h')
| -rw-r--r-- | vp8/encoder/onyx_int.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index ef6812280..455533e77 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -91,9 +91,13 @@ typedef struct { signed char last_mode_lf_deltas[MAX_MODE_LF_DELTAS]; vp8_prob coef_probs[BLOCK_TYPES] - [COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES]; + [COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES]; vp8_prob coef_probs_8x8[BLOCK_TYPES_8X8] - [COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES]; + [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 vp8_prob ymode_prob [VP8_YMODES - 1]; /* interframe intra mode probs */ vp8_prob uv_mode_prob [VP8_YMODES][VP8_UV_MODES - 1]; @@ -388,6 +392,15 @@ typedef struct VP8_COMP { DECLARE_ALIGNED(64, short, zrun_zbin_boost_y2_8x8[QINDEX_RANGE][64]); DECLARE_ALIGNED(64, short, zrun_zbin_boost_uv_8x8[QINDEX_RANGE][64]); +#if CONFIG_TX16X16 + DECLARE_ALIGNED(16, short, Y1zbin_16x16[QINDEX_RANGE][256]); + DECLARE_ALIGNED(16, short, Y2zbin_16x16[QINDEX_RANGE][256]); + DECLARE_ALIGNED(16, short, UVzbin_16x16[QINDEX_RANGE][256]); + DECLARE_ALIGNED(16, short, zrun_zbin_boost_y1_16x16[QINDEX_RANGE][256]); + DECLARE_ALIGNED(16, short, zrun_zbin_boost_y2_16x16[QINDEX_RANGE][256]); + DECLARE_ALIGNED(16, short, zrun_zbin_boost_uv_16x16[QINDEX_RANGE][256]); +#endif + MACROBLOCK mb; VP8_COMMON common; vp8_writer bc, bc2; @@ -538,6 +551,11 @@ typedef struct VP8_COMP { unsigned int coef_counts_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; /* for this frame */ vp8_prob frame_coef_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; unsigned int frame_branch_ct_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES][2]; +#if CONFIG_TX16X16 + unsigned int coef_counts_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; /* for this frame */ + vp8_prob frame_coef_probs_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; + unsigned int frame_branch_ct_16x16 [BLOCK_TYPES_16X16] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES][2]; +#endif int gfu_boost; int last_boost; @@ -596,6 +614,9 @@ typedef struct VP8_COMP { int skip_false_count[3]; int t4x4_count; int t8x8_count; +#if CONFIG_TX16X16 + int t16x16_count; +#endif unsigned char *segmentation_map; |