Commit 3d288156 authored by Hui Su's avatar Hui Su

lv-map: move loading of default CDFs to av1_default_coef_probs()

In preparation for supporting q_adapt_probs.

Change-Id: I4a39b81b0d2c4ceb1586ae411a1216c6c20d896d
parent 7167d952
......@@ -558,6 +558,22 @@ void av1_coef_pareto_cdfs(FRAME_CONTEXT *fc) {
void av1_default_coef_probs(AV1_COMMON *cm) {
const int index = AOMMIN(TOKEN_CDF_Q_CTXS - 1, cm->base_qindex / 64);
#if CONFIG_LV_MAP
(void)index;
av1_copy(cm->fc->txb_skip_cdf, av1_default_txb_skip_cdf);
av1_copy(cm->fc->eob_extra_cdf, av1_default_eob_extra_cdf);
av1_copy(cm->fc->dc_sign_cdf, av1_default_dc_sign_cdf);
av1_copy(cm->fc->coeff_br_cdf, av1_default_coeff_lps_multi);
av1_copy(cm->fc->coeff_base_cdf, av1_default_coeff_base_multi);
av1_copy(cm->fc->coeff_base_eob_cdf, av1_default_coeff_base_eob_multi);
av1_copy(cm->fc->eob_flag_cdf16, av1_default_eob_multi16);
av1_copy(cm->fc->eob_flag_cdf32, av1_default_eob_multi32);
av1_copy(cm->fc->eob_flag_cdf64, av1_default_eob_multi64);
av1_copy(cm->fc->eob_flag_cdf128, av1_default_eob_multi128);
av1_copy(cm->fc->eob_flag_cdf256, av1_default_eob_multi256);
av1_copy(cm->fc->eob_flag_cdf512, av1_default_eob_multi512);
av1_copy(cm->fc->eob_flag_cdf1024, av1_default_eob_multi1024);
#else
av1_copy(cm->fc->coef_head_cdfs[TX_4X4],
(*av1_default_qctx_coef_cdfs[index])[TX_4X4]);
av1_copy(cm->fc->coef_head_cdfs[TX_8X8],
......@@ -571,6 +587,7 @@ void av1_default_coef_probs(AV1_COMMON *cm) {
(*av1_default_qctx_coef_cdfs[index])[TX_32X32]);
#endif // CONFIG_TX64X64
av1_coef_pareto_cdfs(cm->fc);
#endif
}
static void av1_average_cdf(aom_cdf_prob *cdf_ptr[], aom_cdf_prob *fc_cdf_ptr,
......
This diff is collapsed.
This diff is collapsed.
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