Commit e646daa9 authored by Zoe Liu's avatar Zoe Liu

Clean up the code for skip probs

Change-Id: Ia0fd1590d3a5aa1691e6ca0a7ab7ddaab3c7297b
parent 1eed2df9
......@@ -69,13 +69,6 @@ static INLINE int av1_get_skip_context(const MACROBLOCKD *xd) {
return above_skip + left_skip;
}
#if !CONFIG_NEW_MULTISYMBOL
static INLINE aom_prob av1_get_skip_prob(const AV1_COMMON *cm,
const MACROBLOCKD *xd) {
return cm->fc->skip_probs[av1_get_skip_context(xd)];
}
#endif // !CONFIG_NEW_MULTISYMBOL
#if CONFIG_DUAL_FILTER
int av1_get_pred_context_switchable_interp(const MACROBLOCKD *xd, int dir);
#else
......
......@@ -388,12 +388,12 @@ static int write_skip(const AV1_COMMON *cm, const MACROBLOCKD *xd,
return 1;
} else {
const int skip = mi->mbmi.skip;
const int ctx = av1_get_skip_context(xd);
#if CONFIG_NEW_MULTISYMBOL
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
const int ctx = av1_get_skip_context(xd);
aom_write_symbol(w, skip, ec_ctx->skip_cdfs[ctx], 2);
#else
aom_write(w, skip, av1_get_skip_prob(cm, xd));
aom_write(w, skip, cm->fc->skip_probs[ctx]);
#endif
return skip;
}
......
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