| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "./vp9_rtcd.h" | 11 #include "./vp9_rtcd.h" |
| 12 #include "vp9/common/vp9_common.h" | 12 #include "vp9/common/vp9_common.h" |
| 13 #include "vpx_ports/mem.h" |
| 13 | 14 |
| 14 void vp9_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, | 15 void vp9_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, |
| 15 uint8_t *dst, ptrdiff_t dst_stride, | 16 uint8_t *dst, ptrdiff_t dst_stride, |
| 16 const int16_t *filter_x, int x_step_q4, | 17 const int16_t *filter_x, int x_step_q4, |
| 17 const int16_t *filter_y, int y_step_q4, | 18 const int16_t *filter_y, int y_step_q4, |
| 18 int w, int h) { | 19 int w, int h) { |
| 19 /* Given our constraints: w <= 64, h <= 64, taps == 8 we can reduce the | 20 /* Given our constraints: w <= 64, h <= 64, taps == 8 we can reduce the |
| 20 * maximum buffer size to 64 * 64 + 7 (+ 1 to make it divisible by 4). | 21 * maximum buffer size to 64 * 64 + 7 (+ 1 to make it divisible by 4). |
| 21 */ | 22 */ |
| 22 uint8_t temp[64 * 72]; | 23 DECLARE_ALIGNED_ARRAY(8, uint8_t, temp, 64 * 72); |
| 23 | 24 |
| 24 // Account for the vertical phase needing 3 lines prior and 4 lines post | 25 // Account for the vertical phase needing 3 lines prior and 4 lines post |
| 25 int intermediate_height = h + 7; | 26 int intermediate_height = h + 7; |
| 26 | 27 |
| 27 if (x_step_q4 != 16 || y_step_q4 != 16) | 28 if (x_step_q4 != 16 || y_step_q4 != 16) |
| 28 return vp9_convolve8_c(src, src_stride, | 29 return vp9_convolve8_c(src, src_stride, |
| 29 dst, dst_stride, | 30 dst, dst_stride, |
| 30 filter_x, x_step_q4, | 31 filter_x, x_step_q4, |
| 31 filter_y, y_step_q4, | 32 filter_y, y_step_q4, |
| 32 w, h); | 33 w, h); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 46 dst, dst_stride, | 47 dst, dst_stride, |
| 47 filter_x, x_step_q4, filter_y, y_step_q4, | 48 filter_x, x_step_q4, filter_y, y_step_q4, |
| 48 w, h); | 49 w, h); |
| 49 } | 50 } |
| 50 | 51 |
| 51 void vp9_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, | 52 void vp9_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, |
| 52 uint8_t *dst, ptrdiff_t dst_stride, | 53 uint8_t *dst, ptrdiff_t dst_stride, |
| 53 const int16_t *filter_x, int x_step_q4, | 54 const int16_t *filter_x, int x_step_q4, |
| 54 const int16_t *filter_y, int y_step_q4, | 55 const int16_t *filter_y, int y_step_q4, |
| 55 int w, int h) { | 56 int w, int h) { |
| 56 uint8_t temp[64 * 72]; | 57 DECLARE_ALIGNED_ARRAY(8, uint8_t, temp, 64 * 72); |
| 57 int intermediate_height = h + 7; | 58 int intermediate_height = h + 7; |
| 58 | 59 |
| 59 if (x_step_q4 != 16 || y_step_q4 != 16) | 60 if (x_step_q4 != 16 || y_step_q4 != 16) |
| 60 return vp9_convolve8_avg_c(src, src_stride, | 61 return vp9_convolve8_avg_c(src, src_stride, |
| 61 dst, dst_stride, | 62 dst, dst_stride, |
| 62 filter_x, x_step_q4, | 63 filter_x, x_step_q4, |
| 63 filter_y, y_step_q4, | 64 filter_y, y_step_q4, |
| 64 w, h); | 65 w, h); |
| 65 | 66 |
| 66 /* This implementation has the same issues as above. In addition, we only want | 67 /* This implementation has the same issues as above. In addition, we only want |
| 67 * to average the values after both passes. | 68 * to average the values after both passes. |
| 68 */ | 69 */ |
| 69 vp9_convolve8_horiz_neon(src - src_stride * 3, src_stride, | 70 vp9_convolve8_horiz_neon(src - src_stride * 3, src_stride, |
| 70 temp, 64, | 71 temp, 64, |
| 71 filter_x, x_step_q4, filter_y, y_step_q4, | 72 filter_x, x_step_q4, filter_y, y_step_q4, |
| 72 w, intermediate_height); | 73 w, intermediate_height); |
| 73 vp9_convolve8_avg_vert_neon(temp + 64 * 3, | 74 vp9_convolve8_avg_vert_neon(temp + 64 * 3, |
| 74 64, dst, dst_stride, | 75 64, dst, dst_stride, |
| 75 filter_x, x_step_q4, filter_y, y_step_q4, | 76 filter_x, x_step_q4, filter_y, y_step_q4, |
| 76 w, h); | 77 w, h); |
| 77 } | 78 } |
| OLD | NEW |