| Index: third_party/libvpx_new/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
|
| diff --git a/third_party/libvpx_new/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h b/third_party/libvpx_new/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
|
| index a7c415d6784f8d54edb09252d1aace122e9a0b79..c8b17ecaeb9df930aff6aee37f54000ad0600fe0 100644
|
| --- a/third_party/libvpx_new/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
|
| +++ b/third_party/libvpx_new/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
|
| @@ -57,14 +57,6 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
|
| int vp8_block_error_c(short *coeff, short *dqcoeff);
|
| #define vp8_block_error vp8_block_error_c
|
|
|
| -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
|
| -void vp8_build_intra_predictors_mbuv_s_neon(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
|
| -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
|
| -
|
| -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
|
| -void vp8_build_intra_predictors_mby_s_neon(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
|
| -RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
|
| -
|
| void vp8_clear_system_state_c();
|
| #define vp8_clear_system_state vp8_clear_system_state_c
|
|
|
| @@ -135,10 +127,6 @@ void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char
|
| int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
|
| #define vp8_full_search_sad vp8_full_search_sad_c
|
|
|
| -void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
|
| -void vp8_intra4x4_predict_armv6(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
|
| -#define vp8_intra4x4_predict vp8_intra4x4_predict_armv6
|
| -
|
| void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
|
| void vp8_loop_filter_bh_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
|
| void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
|
| @@ -268,10 +256,6 @@ static void setup_rtcd_internal(void)
|
| if (flags & HAS_NEON) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_neon;
|
| vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_armv6;
|
| if (flags & HAS_NEON) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_neon;
|
| - vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c;
|
| - if (flags & HAS_NEON) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_neon;
|
| - vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c;
|
| - if (flags & HAS_NEON) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_neon;
|
| vp8_copy_mem16x16 = vp8_copy_mem16x16_v6;
|
| if (flags & HAS_NEON) vp8_copy_mem16x16 = vp8_copy_mem16x16_neon;
|
| vp8_copy_mem8x4 = vp8_copy_mem8x4_v6;
|
|
|