Commit c1d54a43 authored by James Zern's avatar James Zern

av1_dist_block: quiet -Wshorten-64-to-32 warning

make tmp an int64 as 12-bit may exceed 32-bits

BUG=aomedia:445

Change-Id: I5e7bc9e90b6c3c0c30e725efaf5f5e217cfbe82a
parent f152a0b9
...@@ -1392,7 +1392,7 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, ...@@ -1392,7 +1392,7 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane,
const tran_low_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block); const tran_low_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
const uint16_t eob = p->eobs[block]; const uint16_t eob = p->eobs[block];
unsigned int tmp; int64_t tmp;
assert(cpi != NULL); assert(cpi != NULL);
assert(tx_size_wide_log2[0] == tx_size_high_log2[0]); assert(tx_size_wide_log2[0] == tx_size_high_log2[0]);
...@@ -1430,7 +1430,7 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, ...@@ -1430,7 +1430,7 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane,
tmp = ROUND_POWER_OF_TWO(tmp, (xd->bd - 8) * 2); tmp = ROUND_POWER_OF_TWO(tmp, (xd->bd - 8) * 2);
#endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_HIGHBITDEPTH
} }
*out_sse = (int64_t)tmp * 16; *out_sse = tmp * 16;
if (eob) { if (eob) {
if (output_status == OUTPUT_HAS_DECODED_PIXELS) { if (output_status == OUTPUT_HAS_DECODED_PIXELS) {
......
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