From ff655420b5f5b1bcf8eda1bada45b8ad81c20e7e Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 6 Jan 2014 17:38:57 -0800 Subject: Reusing ROUND_POWER_OF_TWO macro. Change-Id: I064ba32d5358bfbf080a4300fc1793b345080006 --- vp9/encoder/vp9_encodeframe.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index c37a50e48..7c5d0bf6d 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -107,11 +107,9 @@ static const uint8_t VP9_VAR_OFFS[64] = { static unsigned int get_sby_perpixel_variance(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) { unsigned int var, sse; - var = cpi->fn_ptr[bs].vf(x->plane[0].src.buf, - x->plane[0].src.stride, + var = cpi->fn_ptr[bs].vf(x->plane[0].src.buf, x->plane[0].src.stride, VP9_VAR_OFFS, 0, &sse); - return (var + (1 << (num_pels_log2_lookup[bs] - 1))) >> - num_pels_log2_lookup[bs]; + return ROUND_POWER_OF_TWO(var, num_pels_log2_lookup[bs]); } // Original activity measure from Tim T's code. -- cgit v1.2.3