diff options
Diffstat (limited to 'vp8/common/entropy.h')
| -rw-r--r-- | vp8/common/entropy.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 66d282b61..d3e841c3e 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -14,7 +14,7 @@ #include "treecoder.h" #include "blockd.h" - +#include "common.h" /* Coefficient token alphabet */ #define ZERO_TOKEN 0 /* 0 Extra Bits 0+0 */ @@ -27,7 +27,7 @@ #define DCT_VAL_CATEGORY3 7 /* 11-18 Extra Bits 3+1 */ #define DCT_VAL_CATEGORY4 8 /* 19-34 Extra Bits 4+1 */ #define DCT_VAL_CATEGORY5 9 /* 35-66 Extra Bits 5+1 */ -#define DCT_VAL_CATEGORY6 10 /* 67+ Extra Bits 11+1 */ +#define DCT_VAL_CATEGORY6 10 /* 67+ Extra Bits 13+1 */ #define DCT_EOB_TOKEN 11 /* EOB Extra Bits 0+0 */ #define MAX_ENTROPY_TOKENS 12 @@ -50,8 +50,11 @@ extern vp8_extra_bit_struct vp8_extra_bits[12]; /* indexed by token value */ #define PROB_UPDATE_BASELINE_COST 7 #define MAX_PROB 255 +#if CONFIG_EXTEND_QRANGE +#define DCT_MAX_VALUE 8192 +#else #define DCT_MAX_VALUE 2048 - +#endif /* Coefficients are predicted via a 3-dimensional probability table. */ @@ -64,6 +67,9 @@ 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 @@ -87,14 +93,19 @@ extern DECLARE_ALIGNED(16, const unsigned char, vp8_coef_bands[16]); 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 extern const int vp8_mb_feature_data_bits[MB_LVL_MAX]; void vp8_coef_tree_initialize(void); |