diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:22:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-27 12:22:55 -0700 |
| commit | 96f9473866194101807869ef6b0259849d233c77 (patch) | |
| tree | 970f1c796fab9ac7c9bae3d00ca4a5742b2f6e20 /vp8/common/entropy.h | |
| parent | 16945391c33f841306c02a0d7016a036352964aa (diff) | |
| parent | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (diff) | |
| download | libvpx-96f9473866194101807869ef6b0259849d233c77.tar libvpx-96f9473866194101807869ef6b0259849d233c77.tar.gz libvpx-96f9473866194101807869ef6b0259849d233c77.tar.bz2 libvpx-96f9473866194101807869ef6b0259849d233c77.zip | |
Merge "Merges several experiments" into experimental
Diffstat (limited to 'vp8/common/entropy.h')
| -rw-r--r-- | vp8/common/entropy.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index aa1faca43..8bb718a06 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -89,17 +89,11 @@ extern DECLARE_ALIGNED(64, const unsigned char, vp8_coef_bands_8x8[64]); distinct bands). */ /*# define DC_TOKEN_CONTEXTS 3*/ /* 00, 0!0, !0!0 */ -#if CONFIG_EXPANDED_COEF_CONTEXT #define PREV_COEF_CONTEXTS 4 -#else -#define PREV_COEF_CONTEXTS 3 -#endif -#if CONFIG_NEWUPDATE #define SUBEXP_PARAM 4 /* Subexponential code parameter */ #define MODULUS_PARAM 13 /* Modulus parameter */ #define COEFUPDATETYPE 1 /* coef update type to use (1/2/3) */ -#endif extern DECLARE_ALIGNED(16, const unsigned char, vp8_prev_token_class[MAX_ENTROPY_TOKENS]); @@ -118,7 +112,5 @@ extern DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]); extern short vp8_default_zig_zag_mask_8x8[64];// int64_t void vp8_coef_tree_initialize(void); -#if CONFIG_ADAPTIVE_ENTROPY void vp8_adapt_coef_probs(struct VP8Common *); #endif -#endif |