Commit 9480e7ba authored by Jingning Han's avatar Jingning Han

Fix clang warnings in lv-map/multi

Change-Id: I6d7f2e51cff630acd88033f58931812052987c4b
parent d64e92c1
......@@ -208,11 +208,7 @@ static INLINE void av1_tree_to_cdf(const aom_tree_index *tree,
void av1_indices_from_tree(int *ind, int *inv, const aom_tree_index *tree);
static INLINE void update_cdf(aom_cdf_prob *cdf, int val, int nsymbs) {
int rate = 4 + (cdf[nsymbs] > 31) + get_msb(nsymbs);
#if CONFIG_LV_MAP
if (nsymbs == 2)
rate = 4 + (cdf[nsymbs] > 7) + (cdf[nsymbs] > 15) + get_msb(nsymbs);
#endif
int rate;
const int rate2 = 5;
int i, tmp;
int diff;
......@@ -239,6 +235,11 @@ static INLINE void update_cdf(aom_cdf_prob *cdf, int val, int nsymbs) {
}
#else
rate = 4 + (cdf[nsymbs] > 31) + get_msb(nsymbs);
#if CONFIG_LV_MAP
if (nsymbs == 2)
rate = 4 + (cdf[nsymbs] > 7) + (cdf[nsymbs] > 15) + get_msb(nsymbs);
#endif
const int tmp0 = 1 << rate2;
tmp = AOM_ICDF(tmp0);
diff = ((CDF_PROB_TOP - (nsymbs << rate2)) >> rate) << rate;
......
......@@ -611,8 +611,6 @@ int av1_cost_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
LV_MAP_COEFF_COST *coeff_costs = &x->coeff_costs[txs_ctx][plane_type];
cost = 0;
if (eob == 0) {
cost = coeff_costs->txb_skip_cost[txb_skip_ctx][1];
return cost;
......
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