From 45648532bce81ebc325b6314cf26f1fb96b8358a Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 15 Jun 2014 12:40:16 -0700 Subject: [PATCH] vp9_pickmode.c: fix vs12 compiler warnings Change-Id: I5042b76a7050c121bf960ecb20c79d35adcc4cd5 --- vp9/encoder/vp9_pickmode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 80966ad7e..3f4fcd1e1 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -158,15 +158,16 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize, int64_t dist; struct macroblock_plane *const p = &x->plane[0]; struct macroblockd_plane *const pd = &xd->plane[0]; - const int quant = pd->dequant[1]; + const uint32_t dc_quant = pd->dequant[0]; + const uint32_t ac_quant = pd->dequant[1]; unsigned int var = cpi->fn_ptr[bsize].vf(p->src.buf, p->src.stride, pd->dst.buf, pd->dst.stride, &sse); *var_y = var; *sse_y = sse; - if (sse < pd->dequant[0] * pd->dequant[0] >> 6) + if (sse < dc_quant * dc_quant >> 6) x->skip_txfm = 1; - else if (var < quant * quant >> 6) + else if (var < ac_quant * ac_quant >> 6) x->skip_txfm = 2; else x->skip_txfm = 0; @@ -177,7 +178,7 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize, if ((sse >> 3) > var) sse = var; vp9_model_rd_from_var_lapndz(var + sse, 1 << num_pels_log2_lookup[bsize], - quant >> 3, &rate, &dist); + ac_quant >> 3, &rate, &dist); *out_rate_sum = rate; *out_dist_sum = dist << 3; }