| Index: source/libvpx/vp9/common/vp9_convolve.c
|
| ===================================================================
|
| --- source/libvpx/vp9/common/vp9_convolve.c (revision 223100)
|
| +++ source/libvpx/vp9/common/vp9_convolve.c (working copy)
|
| @@ -191,17 +191,18 @@
|
| const int16_t *filter_y, int y_step_q4,
|
| int w, int h, int taps) {
|
| /* Fixed size intermediate buffer places limits on parameters.
|
| - * Maximum intermediate_height is 135, for y_step_q4 == 32,
|
| + * Maximum intermediate_height is 324, for y_step_q4 == 80,
|
| * h == 64, taps == 8.
|
| + * y_step_q4 of 80 allows for 1/10 scale for 5 layer svc
|
| */
|
| - uint8_t temp[64 * 135];
|
| - int intermediate_height = MAX(((h * y_step_q4) >> 4), 1) + taps - 1;
|
| + uint8_t temp[64 * 324];
|
| + int intermediate_height = (((h - 1) * y_step_q4 + 15) >> 4) + taps;
|
|
|
| assert(w <= 64);
|
| assert(h <= 64);
|
| assert(taps <= 8);
|
| - assert(y_step_q4 <= 32);
|
| - assert(x_step_q4 <= 32);
|
| + assert(y_step_q4 <= 80);
|
| + assert(x_step_q4 <= 80);
|
|
|
| if (intermediate_height < h)
|
| intermediate_height = h;
|
|
|