From cec763bd97fbcd5df42ba58a293b3136708a397e Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 9 Oct 2014 11:41:36 +0200 Subject: [PATCH] set_vt_partitioning: fix type conversion warning double -> int64 + make threshold_multiplier an int Change-Id: I6d3607fdf13d670f57c9d9b04a80acb2be1346a0 --- vp9/encoder/vp9_encodeframe.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fed1654..491c7d6 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -396,9 +396,10 @@ static int set_vt_partitioning(VP9_COMP *cpi, const int block_width = num_8x8_blocks_wide_lookup[bsize]; const int block_height = num_8x8_blocks_high_lookup[bsize]; // TODO(debargha): Choose this more intelligently. - const int64_t threshold_multiplier = cm->frame_type == KEY_FRAME ? 64 : 4; - int64_t threshold = threshold_multiplier * - vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth); + const int threshold_multiplier = cm->frame_type == KEY_FRAME ? 64 : 4; + int64_t threshold = + (int64_t)(threshold_multiplier * + vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth)); assert(block_height == block_width); tree_to_node(data, bsize, &vt); -- 2.7.4