Add probability/count tables for lv_map experiment Change-Id: Ie73bb51d4a24c2ff719758c38e303db92e6f4500
diff --git a/av1/common/entropy.h b/av1/common/entropy.h index 11639a8..4cbd610 100644 --- a/av1/common/entropy.h +++ b/av1/common/entropy.h
@@ -56,6 +56,24 @@ #define ENTROPY_NODES 11 +#if CONFIG_LV_MAP +#define TXB_SKIP_CONTEXTS 13 +#define SIG_COEF_CONTEXTS 20 +#define EOB_COEF_CONTEXTS 25 +#define COEFF_BASE_CONTEXTS 42 +#define DC_SIGN_CONTEXTS 3 + +#define BR_TMP_OFFSET 12 +#define BR_REF_CAT 4 +#define LEVEL_CONTEXTS (BR_TMP_OFFSET * BR_REF_CAT) + +#define NUM_BASE_LEVELS 2 +#define COEFF_BASE_RANGE (15 - NUM_BASE_LEVELS) + +#define COEFF_CONTEXT_BITS 6 +#define COEFF_CONTEXT_MASK ((1 << COEFF_CONTEXT_BITS) - 1) +#endif + DECLARE_ALIGNED(16, extern const uint8_t, av1_pt_energy_class[ENTROPY_TOKENS]); #define CAT1_MIN_VAL 5
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index f13721d..15933b1 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -160,6 +160,16 @@ SCAN_ORDER sc[TX_SIZES_ALL][TX_TYPES]; #endif // CONFIG_ADAPT_SCAN +#if CONFIG_LV_MAP + aom_prob txb_skip[TX_SIZES][TXB_SKIP_CONTEXTS]; + aom_prob nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS]; + aom_prob eob_flag[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS]; + aom_prob dc_sign[PLANE_TYPES][DC_SIGN_CONTEXTS]; + aom_prob coeff_base[TX_SIZES][PLANE_TYPES][NUM_BASE_LEVELS] + [COEFF_BASE_CONTEXTS]; + aom_prob coeff_lps[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS]; +#endif + #if CONFIG_REF_MV aom_prob newmv_prob[NEWMV_MODE_CONTEXTS]; aom_prob zeromv_prob[ZEROMV_MODE_CONTEXTS]; @@ -288,6 +298,17 @@ unsigned int txb_count[TX_SIZES_ALL][TX_TYPES]; #endif // CONFIG_ADAPT_SCAN + +#if CONFIG_LV_MAP + unsigned int txb_skip[TX_SIZES][TXB_SKIP_CONTEXTS][2]; + unsigned int nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS][2]; + unsigned int eob_flag[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS][2]; + unsigned int dc_sign[PLANE_TYPES][DC_SIGN_CONTEXTS][2]; + unsigned int coeff_base[TX_SIZES][PLANE_TYPES][NUM_BASE_LEVELS] + [COEFF_BASE_CONTEXTS][2]; + unsigned int coeff_lps[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS][2]; +#endif // CONFIG_LV_MAP + #if CONFIG_EC_MULTISYMBOL av1_blockz_count_model blockz_count[TX_SIZES][PLANE_TYPES]; #endif