Commit 8e0b8697 authored by Thomas Davies's avatar Thomas Davies

EC_MULTISYMBOL: Add new context tables.

These are optimized for EOB_TOKEN being associated
with the current position, not the previous.

CBP tables cover EOB_TOKEN for the the whole block.

This change causes a performance regression until
EOB_TOKEN is merged into the coding scheme.

Change-Id: Ica3a12ed97285cbae204ce3cc1a7e658ebcacc9f
parent af18794f
This diff is collapsed.
......@@ -128,6 +128,9 @@ extern const av1_extra_bit av1_extra_bits_high12[ENTROPY_TOKENS];
distinct bands). */
#define COEFF_CONTEXTS 6
#if CONFIG_EC_MULTISYMBOL
#define BLOCKZ_CONTEXTS 3
#endif
#define COEFF_CONTEXTS0 3 // for band 0
#define BAND_COEFF_CONTEXTS(band) \
((band) == 0 ? COEFF_CONTEXTS0 : COEFF_CONTEXTS)
......
......@@ -87,6 +87,7 @@ typedef struct frame_contexts {
#if CONFIG_EC_MULTISYMBOL
coeff_cdf_model coef_tail_cdfs[TX_SIZES][PLANE_TYPES];
coeff_cdf_model coef_head_cdfs[TX_SIZES][PLANE_TYPES];
aom_prob blockzero_probs[TX_SIZES][PLANE_TYPES][REF_TYPES][BLOCKZ_CONTEXTS];
#endif // CONFIG_EC_MULTISYMBOL
aom_prob switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS - 1];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment