ref: ff655420b5f5b1bcf8eda1bada45b8ad81c20e7e
parent: 166d8142ac5a68a5e5a8646029c8beb796b3b99c
author: Dmitry Kovalev <dkovalev@google.com>
date: Mon Jan 6 12:38:57 EST 2014
Reusing ROUND_POWER_OF_TWO macro. Change-Id: I064ba32d5358bfbf080a4300fc1793b345080006
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -107,11 +107,9 @@
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.
--
⑨