Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(798)

Unified Diff: source/libvpx/vp9/encoder/vp9_vaq.c

Issue 111463005: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_treewriter.c ('k') | source/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/encoder/vp9_vaq.c
===================================================================
--- source/libvpx/vp9/encoder/vp9_vaq.c (revision 240950)
+++ source/libvpx/vp9/encoder/vp9_vaq.c (working copy)
@@ -118,8 +118,8 @@
((-xd->mb_to_bottom_edge) >> 3) : 0;
if (right_overflow || bottom_overflow) {
- int bw = (1 << (mi_width_log2(bs) + 3)) - right_overflow;
- int bh = (1 << (mi_height_log2(bs) + 3)) - bottom_overflow;
+ const int bw = 8 * num_8x8_blocks_wide_lookup[bs] - right_overflow;
+ const int bh = 8 * num_8x8_blocks_high_lookup[bs] - bottom_overflow;
int avg;
variance(x->plane[0].src.buf, x->plane[0].src.stride,
vp9_64_zeros, 0, bw, bh, &sse, &avg);
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_treewriter.c ('k') | source/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698