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/entropy.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/entropy.h')
| -rw-r--r-- | vp8/common/entropy.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 541aa4d4c..c7a41f58b 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -63,9 +63,7 @@ extern vp8_extra_bit_struct vp8_extra_bits[12]; /* indexed by token value */ #define COEF_BANDS 8 extern DECLARE_ALIGNED(16, const unsigned char, vp8_coef_bands[16]); -#if CONFIG_T8X8 extern DECLARE_ALIGNED(64, const unsigned char, vp8_coef_bands_8x8[64]); -#endif /* Inside dimension is 3-valued measure of nearby complexity, that is, the extent to which nearby coefficients are nonzero. For the first @@ -89,18 +87,14 @@ extern DECLARE_ALIGNED(64, const unsigned char, vp8_coef_bands_8x8[64]); extern DECLARE_ALIGNED(16, const unsigned char, vp8_prev_token_class[MAX_ENTROPY_TOKENS]); extern const vp8_prob vp8_coef_update_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; -#if CONFIG_T8X8 extern const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; -#endif struct VP8Common; void vp8_default_coef_probs(struct VP8Common *); extern DECLARE_ALIGNED(16, const int, vp8_default_zig_zag1d[16]); extern DECLARE_ALIGNED(16, const short, vp8_default_inv_zig_zag[16]); extern short vp8_default_zig_zag_mask[16]; -#if CONFIG_T8X8 extern DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]); extern short vp8_default_zig_zag_mask_8x8[64];//int64_t -#endif void vp8_coef_tree_initialize(void); #endif |