diff options
| -rw-r--r-- | vp9/common/vp9_entropy.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_entropy.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index 16ef14fec..faa45bd5f 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -1555,6 +1555,7 @@ static void adapt_coef_probs(vp9_coeff_probs *dst_coef_probs, } void vp9_adapt_coef_probs(VP9_COMMON *cm) { +#ifndef DISABLE_COEF_ADAPT int count_sat; int update_factor; /* denominator 256 */ @@ -1585,6 +1586,7 @@ void vp9_adapt_coef_probs(VP9_COMMON *cm) { cm->base_qindex, cm->fc.coef_counts_32x32, cm->fc.eob_branch_counts[TX_32X32], count_sat, update_factor); +#endif } #if CONFIG_CODE_ZEROGROUP diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 06641dcdf..f35384b79 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -84,6 +84,9 @@ 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 + typedef unsigned int vp9_coeff_count[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; typedef unsigned int vp9_coeff_stats[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] @@ -158,7 +161,7 @@ const int *vp9_get_coef_neighbors_handle(const int *scan, int *pad); // if model-based how many nodes are unconstrained #define UNCONSTRAINED_UPDATE_NODES 3 // whether backward updates are model-based -#define MODEL_BASED_ADAPT 0 +#define MODEL_BASED_ADAPT 1 #define UNCONSTRAINED_ADAPT_NODES 3 typedef vp9_prob vp9_coeff_probs_model[REF_TYPES][COEF_BANDS] |