Commit 599dfd01 authored by David Barker's avatar David Barker Committed by Debargha Mukherjee

Fix compile error with ref-mv

Change-Id: If7a117b78473d5b1f02b0219ddc314c7be7fbbbf
parent f541932b
......@@ -4234,7 +4234,11 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
}
#if CONFIG_EC_MULTISYMBOL
av1_coef_pareto_cdfs(fc);
#if CONFIG_REF_MV
for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
#else
av1_set_mv_cdfs(&fc->nmvc);
#endif
#if CONFIG_DAALA_EC
av1_set_mode_cdfs(cm);
#endif
......
......@@ -4164,9 +4164,15 @@ static uint32_t write_compressed_header(AV1_COMP *cpi, uint8_t *data) {
&counts->mv);
#endif
#if CONFIG_DAALA_EC
#if CONFIG_REF_MV
for (i = 0; i < NMV_CONTEXTS; ++i)
av1_tree_to_cdf(av1_mv_joint_tree, cm->fc->nmvc[i].joints,
cm->fc->nmvc[i].joint_cdf);
#else
av1_tree_to_cdf(av1_mv_joint_tree, cm->fc->nmvc.joints,
cm->fc->nmvc.joint_cdf);
#endif
#endif
#if !CONFIG_EC_ADAPT
update_ext_tx_probs(cm, header_bc);
#endif
......@@ -4179,7 +4185,11 @@ static uint32_t write_compressed_header(AV1_COMP *cpi, uint8_t *data) {
}
#if CONFIG_EC_MULTISYMBOL
av1_coef_pareto_cdfs(fc);
#if CONFIG_REF_MV
for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
#else
av1_set_mv_cdfs(&fc->nmvc);
#endif
#if CONFIG_DAALA_EC
av1_set_mode_cdfs(cm);
#endif
......
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