diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-05-30 08:10:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 08:10:47 -0700 |
| commit | c98bfcfbbb23dc7c8c8641831922877d0d31c67e (patch) | |
| tree | c700b805ddde78db701295cd2b968903f460b30b /vp9/common/vp9_entropy.h | |
| parent | ecf023f6e483706a4bf352b1dfcd9fb996ca4555 (diff) | |
| parent | b8b3f1a46d756bef73cb4f3cd6990a01cbacaa25 (diff) | |
| download | libvpx-c98bfcfbbb23dc7c8c8641831922877d0d31c67e.tar libvpx-c98bfcfbbb23dc7c8c8641831922877d0d31c67e.tar.gz libvpx-c98bfcfbbb23dc7c8c8641831922877d0d31c67e.tar.bz2 libvpx-c98bfcfbbb23dc7c8c8641831922877d0d31c67e.zip | |
Merge "Balancing coef-tree to reduce bool decodes" into experimental
Diffstat (limited to 'vp9/common/vp9_entropy.h')
| -rw-r--r-- | vp9/common/vp9_entropy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index e76211a7c..27e3bec5a 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -85,8 +85,7 @@ extern vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */ /*# define DC_TOKEN_CONTEXTS 3*/ /* 00, 0!0, !0!0 */ #define PREV_COEF_CONTEXTS 6 -// Disables backward coef probs adaption -// #define DISABLE_COEF_ADAPT +// #define ENTROPY_STATS typedef unsigned int vp9_coeff_count[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; @@ -162,6 +161,7 @@ const int *vp9_get_coef_neighbors_handle(const int *scan, int *pad); #define UNCONSTRAINED_NODES 3 #define MODEL_NODES (ENTROPY_NODES - UNCONSTRAINED_NODES) + #define PIVOT_NODE 2 // which node is pivot typedef vp9_prob vp9_coeff_probs_model[REF_TYPES][COEF_BANDS] |