From 00a4b20fbecc1137ff9a0421d51f4131013bb70a Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 3 Oct 2014 00:09:41 -0700 Subject: [PATCH] rdmult data type change To fix a VS warning. Change-Id: I4c530c0afe8d06acdb8cc78b7995aba57a25373d --- vp9/encoder/vp9_rd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c index efb8686dd..75c396433 100644 --- a/vp9/encoder/vp9_rd.c +++ b/vp9/encoder/vp9_rd.c @@ -138,7 +138,7 @@ static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = { int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth); #if CONFIG_VP9_HIGHBITDEPTH - int rdmult = 0; + int64_t rdmult = 0; switch (cpi->common.bit_depth) { case VPX_BITS_8: rdmult = 88 * q * q / 24; @@ -154,7 +154,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { return -1; } #else - int rdmult = 88 * q * q / 24; + int64_t rdmult = 88 * q * q / 24; #endif // CONFIG_VP9_HIGHBITDEPTH if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) { const GF_GROUP *const gf_group = &cpi->twopass.gf_group; @@ -164,7 +164,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7; rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7); } - return rdmult; + return (int)rdmult; } static int compute_rd_thresh_factor(int qindex, vpx_bit_depth_t bit_depth) { -- 2.40.0