| Index: source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
|
| diff --git a/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h b/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
|
| index c45d9b25b008305160a4da442295ce10984e0b71..a4108d1f790899ba401ef685ff2fc3211505533c 100644
|
| --- a/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
|
| +++ b/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
|
| @@ -93,7 +93,8 @@ void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t
|
| #define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c
|
|
|
| void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c
|
| +void vp9_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_d135_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| #define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c
|
| @@ -123,16 +124,19 @@ void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *a
|
| #define vp9_d207_predictor_8x8 vp9_d207_predictor_8x8_c
|
|
|
| void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_d45_predictor_16x16 vp9_d45_predictor_16x16_c
|
| +void vp9_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| #define vp9_d45_predictor_32x32 vp9_d45_predictor_32x32_c
|
|
|
| void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_d45_predictor_4x4 vp9_d45_predictor_4x4_c
|
| +void vp9_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_d45_predictor_8x8 vp9_d45_predictor_8x8_c
|
| +void vp9_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| #define vp9_d63_predictor_16x16 vp9_d63_predictor_16x16_c
|
| @@ -151,10 +155,12 @@ void vp9_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uin
|
| RTCD_EXTERN void (*vp9_dc_128_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c
|
| +void vp9_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_128_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c
|
| +void vp9_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_128_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| void vp9_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| @@ -165,10 +171,12 @@ void vp9_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const ui
|
| RTCD_EXTERN void (*vp9_dc_left_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c
|
| +void vp9_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_left_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c
|
| +void vp9_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_left_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| void vp9_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| @@ -179,10 +187,12 @@ void vp9_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t
|
| RTCD_EXTERN void (*vp9_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_predictor_32x32 vp9_dc_predictor_32x32_c
|
| +void vp9_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_c
|
| +void vp9_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| void vp9_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| @@ -193,10 +203,12 @@ void vp9_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uin
|
| RTCD_EXTERN void (*vp9_dc_top_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c
|
| +void vp9_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_top_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| -#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c
|
| +void vp9_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| +RTCD_EXTERN void (*vp9_dc_top_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| void vp9_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| @@ -583,20 +595,44 @@ static void setup_rtcd_internal(void)
|
| if (flags & HAS_NEON) vp9_convolve_avg = vp9_convolve_avg_neon;
|
| vp9_convolve_copy = vp9_convolve_copy_c;
|
| if (flags & HAS_NEON) vp9_convolve_copy = vp9_convolve_copy_neon;
|
| + vp9_d135_predictor_4x4 = vp9_d135_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_d135_predictor_4x4 = vp9_d135_predictor_4x4_neon;
|
| + vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_c;
|
| + if (flags & HAS_NEON) vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_neon;
|
| + vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_neon;
|
| + vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_c;
|
| + if (flags & HAS_NEON) vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_neon;
|
| vp9_dc_128_predictor_16x16 = vp9_dc_128_predictor_16x16_c;
|
| if (flags & HAS_NEON) vp9_dc_128_predictor_16x16 = vp9_dc_128_predictor_16x16_neon;
|
| + vp9_dc_128_predictor_32x32 = vp9_dc_128_predictor_32x32_c;
|
| + if (flags & HAS_NEON) vp9_dc_128_predictor_32x32 = vp9_dc_128_predictor_32x32_neon;
|
| + vp9_dc_128_predictor_4x4 = vp9_dc_128_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_dc_128_predictor_4x4 = vp9_dc_128_predictor_4x4_neon;
|
| vp9_dc_128_predictor_8x8 = vp9_dc_128_predictor_8x8_c;
|
| if (flags & HAS_NEON) vp9_dc_128_predictor_8x8 = vp9_dc_128_predictor_8x8_neon;
|
| vp9_dc_left_predictor_16x16 = vp9_dc_left_predictor_16x16_c;
|
| if (flags & HAS_NEON) vp9_dc_left_predictor_16x16 = vp9_dc_left_predictor_16x16_neon;
|
| + vp9_dc_left_predictor_32x32 = vp9_dc_left_predictor_32x32_c;
|
| + if (flags & HAS_NEON) vp9_dc_left_predictor_32x32 = vp9_dc_left_predictor_32x32_neon;
|
| + vp9_dc_left_predictor_4x4 = vp9_dc_left_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_dc_left_predictor_4x4 = vp9_dc_left_predictor_4x4_neon;
|
| vp9_dc_left_predictor_8x8 = vp9_dc_left_predictor_8x8_c;
|
| if (flags & HAS_NEON) vp9_dc_left_predictor_8x8 = vp9_dc_left_predictor_8x8_neon;
|
| vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_c;
|
| if (flags & HAS_NEON) vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_neon;
|
| + vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_c;
|
| + if (flags & HAS_NEON) vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_neon;
|
| + vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_neon;
|
| vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_c;
|
| if (flags & HAS_NEON) vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_neon;
|
| vp9_dc_top_predictor_16x16 = vp9_dc_top_predictor_16x16_c;
|
| if (flags & HAS_NEON) vp9_dc_top_predictor_16x16 = vp9_dc_top_predictor_16x16_neon;
|
| + vp9_dc_top_predictor_32x32 = vp9_dc_top_predictor_32x32_c;
|
| + if (flags & HAS_NEON) vp9_dc_top_predictor_32x32 = vp9_dc_top_predictor_32x32_neon;
|
| + vp9_dc_top_predictor_4x4 = vp9_dc_top_predictor_4x4_c;
|
| + if (flags & HAS_NEON) vp9_dc_top_predictor_4x4 = vp9_dc_top_predictor_4x4_neon;
|
| vp9_dc_top_predictor_8x8 = vp9_dc_top_predictor_8x8_c;
|
| if (flags & HAS_NEON) vp9_dc_top_predictor_8x8 = vp9_dc_top_predictor_8x8_neon;
|
| vp9_fdct8x8 = vp9_fdct8x8_c;
|
|
|