diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-07 02:40:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-07 02:40:02 -0800 |
| commit | 9e18cf70db560e99ea08c2767b5487af8348c2e1 (patch) | |
| tree | 3f902e0f80afe649c409eb0fe5714fe2af0718f4 /vp9/encoder | |
| parent | e4e58ac4008728a657ee0a46d0a15aa645e47ddc (diff) | |
| parent | ff655420b5f5b1bcf8eda1bada45b8ad81c20e7e (diff) | |
| download | libvpx-9e18cf70db560e99ea08c2767b5487af8348c2e1.tar libvpx-9e18cf70db560e99ea08c2767b5487af8348c2e1.tar.gz libvpx-9e18cf70db560e99ea08c2767b5487af8348c2e1.tar.bz2 libvpx-9e18cf70db560e99ea08c2767b5487af8348c2e1.zip | |
Merge "Reusing ROUND_POWER_OF_TWO macro."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 2 insertions, 4 deletions
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. |