diff options
| author | James Zern <jzern@google.com> | 2013-09-03 15:50:33 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-03 15:50:33 -0700 |
| commit | 1cf2272347f8a07b29a0ee2d9d6445826f2f7e6f (patch) | |
| tree | 0cec546ce407898224a38c4f8804796cb6a110ac /vp9/common | |
| parent | 010c0ad0eb19e7be9680720e93e82b418149898e (diff) | |
| parent | e326cecf18a01172074bf9b3a9524c5887a122e7 (diff) | |
| download | libvpx-1cf2272347f8a07b29a0ee2d9d6445826f2f7e6f.tar libvpx-1cf2272347f8a07b29a0ee2d9d6445826f2f7e6f.tar.gz libvpx-1cf2272347f8a07b29a0ee2d9d6445826f2f7e6f.tar.bz2 libvpx-1cf2272347f8a07b29a0ee2d9d6445826f2f7e6f.zip | |
Merge "Fix intermediate height in convolve_c"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_convolve.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp9/common/vp9_convolve.c b/vp9/common/vp9_convolve.c index 1e6cd4404..be092f41c 100644 --- a/vp9/common/vp9_convolve.c +++ b/vp9/common/vp9_convolve.c @@ -195,7 +195,7 @@ static void convolve_c(const uint8_t *src, ptrdiff_t src_stride, * h == 64, taps == 8. */ uint8_t temp[64 * 135]; - int intermediate_height = MAX(((h * y_step_q4) >> 4), 1) + taps - 1; + int intermediate_height = (((h - 1) * y_step_q4 + 15) >> 4) + taps; assert(w <= 64); assert(h <= 64); @@ -203,9 +203,6 @@ static void convolve_c(const uint8_t *src, ptrdiff_t src_stride, assert(y_step_q4 <= 32); assert(x_step_q4 <= 32); - if (intermediate_height < h) - intermediate_height = h; - convolve_horiz_c(src - src_stride * (taps / 2 - 1), src_stride, temp, 64, filter_x, x_step_q4, filter_y, y_step_q4, w, intermediate_height, taps); |