diff options
| -rw-r--r-- | vpx_dsp/arm/sad4d_neon.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/vpx_dsp/arm/sad4d_neon.c b/vpx_dsp/arm/sad4d_neon.c index 44cd99028..3a548d0f9 100644 --- a/vpx_dsp/arm/sad4d_neon.c +++ b/vpx_dsp/arm/sad4d_neon.c @@ -282,11 +282,12 @@ static INLINE void sad4xhx4d_neon(const uint8_t *src, int src_stride, vst1q_u32(res, horizontal_add_4d_uint16x8(sum)); } -#define SAD_WXH_4D_NEON(w, h) \ - void vpx_sad##w##x##h##x4d_neon(const uint8_t *src, int src_stride, \ - const uint8_t *const ref[4], int ref_stride, \ - uint32_t res[4]) { \ - sad##w##xhx4d_neon(src, src_stride, ref, ref_stride, res, (h)); \ +#define SAD_WXH_4D_NEON(w, h) \ + void vpx_sad##w##x##h##x4d_neon(const uint8_t *src_ptr, int src_stride, \ + const uint8_t *const ref_array[4], \ + int ref_stride, uint32_t sad_array[4]) { \ + sad##w##xhx4d_neon(src_ptr, src_stride, ref_array, ref_stride, sad_array, \ + (h)); \ } SAD_WXH_4D_NEON(4, 4) @@ -309,16 +310,17 @@ SAD_WXH_4D_NEON(64, 64) #undef SAD_WXH_4D_NEON -#define SAD_SKIP_WXH_4D_NEON(w, h) \ - void vpx_sad_skip_##w##x##h##x4d_neon(const uint8_t *src, int src_stride, \ - const uint8_t *const ref[4], \ - int ref_stride, uint32_t res[4]) { \ - sad##w##xhx4d_neon(src, 2 * src_stride, ref, 2 * ref_stride, res, \ - ((h) >> 1)); \ - res[0] <<= 1; \ - res[1] <<= 1; \ - res[2] <<= 1; \ - res[3] <<= 1; \ +#define SAD_SKIP_WXH_4D_NEON(w, h) \ + void vpx_sad_skip_##w##x##h##x4d_neon( \ + const uint8_t *src_ptr, int src_stride, \ + const uint8_t *const ref_array[4], int ref_stride, \ + uint32_t sad_array[4]) { \ + sad##w##xhx4d_neon(src_ptr, 2 * src_stride, ref_array, 2 * ref_stride, \ + sad_array, ((h) >> 1)); \ + sad_array[0] <<= 1; \ + sad_array[1] <<= 1; \ + sad_array[2] <<= 1; \ + sad_array[3] <<= 1; \ } SAD_SKIP_WXH_4D_NEON(4, 4) |