EC_ADAPT: use tile context for coefficients.
Change-Id: I61433d0c0bbab9b7cf74a405cbedd60965318888
This commit is contained in:
Родитель
1bfb5edac3
Коммит
489dad8ffe
|
@ -80,7 +80,11 @@ static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
|
||||||
aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
|
aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
|
||||||
fc->coef_probs[tx_size_ctx][type][ref];
|
fc->coef_probs[tx_size_ctx][type][ref];
|
||||||
const aom_prob *prob;
|
const aom_prob *prob;
|
||||||
#if CONFIG_EC_MULTISYMBOL
|
#if CONFIG_EC_ADAPT
|
||||||
|
aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
||||||
|
xd->tile_ctx->coef_cdfs[tx_size][type][ref];
|
||||||
|
aom_cdf_prob(*cdf)[ENTROPY_TOKENS];
|
||||||
|
#elif CONFIG_EC_MULTISYMBOL
|
||||||
aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
||||||
fc->coef_cdfs[tx_size_ctx][type][ref];
|
fc->coef_cdfs[tx_size_ctx][type][ref];
|
||||||
aom_cdf_prob(*cdf)[ENTROPY_TOKENS];
|
aom_cdf_prob(*cdf)[ENTROPY_TOKENS];
|
||||||
|
|
|
@ -463,7 +463,11 @@ static void tokenize_b(int plane, int block, int blk_row, int blk_col,
|
||||||
aom_prob(*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
|
aom_prob(*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
|
||||||
cpi->common.fc->coef_probs[txsize_sqr_map[tx_size]][type][ref];
|
cpi->common.fc->coef_probs[txsize_sqr_map[tx_size]][type][ref];
|
||||||
#endif // CONFIG_ENTROPY
|
#endif // CONFIG_ENTROPY
|
||||||
#if CONFIG_EC_MULTISYMBOL
|
|
||||||
|
#if CONFIG_EC_ADAPT // use per-tile context
|
||||||
|
aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
||||||
|
xd->tile_ctx->coef_cdfs[tx_size][type][ref];
|
||||||
|
#elif CONFIG_EC_MULTISYMBOL
|
||||||
aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
||||||
cpi->common.fc->coef_cdfs[tx_size][type][ref];
|
cpi->common.fc->coef_cdfs[tx_size][type][ref];
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче