| Index: third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h
|
| diff --git a/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h
|
| index ef9ac7dc70a3fe3788e1147f5f3c6f44c9ad8a9d..a852ec3f924936397a9f17cfd739626057a401d5 100644
|
| --- a/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h
|
| +++ b/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h
|
| @@ -365,8 +365,7 @@ void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, int *mi
|
| #define vpx_minmax_8x8 vpx_minmax_8x8_c
|
|
|
| unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| -unsigned int vpx_mse16x16_media(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| -#define vpx_mse16x16 vpx_mse16x16_media
|
| +#define vpx_mse16x16 vpx_mse16x16_c
|
|
|
| unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| #define vpx_mse16x8 vpx_mse16x8_c
|
| @@ -390,8 +389,7 @@ void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int
|
| #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c
|
|
|
| unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -unsigned int vpx_sad16x16_media(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -#define vpx_sad16x16 vpx_sad16x16_media
|
| +#define vpx_sad16x16 vpx_sad16x16_c
|
|
|
| unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
|
| #define vpx_sad16x16_avg vpx_sad16x16_avg_c
|
| @@ -616,8 +614,7 @@ uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stri
|
| #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c
|
|
|
| uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
|
| -uint32_t vpx_sub_pixel_variance16x16_media(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
|
| -#define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_media
|
| +#define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c
|
|
|
| uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
|
| #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c
|
| @@ -653,8 +650,7 @@ uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride,
|
| #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c
|
|
|
| uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
|
| -uint32_t vpx_sub_pixel_variance8x8_media(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
|
| -#define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_media
|
| +#define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c
|
|
|
| void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
|
| #define vpx_subtract_block vpx_subtract_block_c
|
| @@ -687,8 +683,7 @@ void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *abov
|
| #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c
|
|
|
| unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -unsigned int vpx_variance16x16_media(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -#define vpx_variance16x16 vpx_variance16x16_media
|
| +#define vpx_variance16x16 vpx_variance16x16_c
|
|
|
| unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| #define vpx_variance16x32 vpx_variance16x32_c
|
| @@ -724,20 +719,16 @@ unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, const
|
| #define vpx_variance8x4 vpx_variance8x4_c
|
|
|
| unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -unsigned int vpx_variance8x8_media(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -#define vpx_variance8x8 vpx_variance8x8_media
|
| +#define vpx_variance8x8 vpx_variance8x8_c
|
|
|
| uint32_t vpx_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -uint32_t vpx_variance_halfpixvar16x16_h_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -#define vpx_variance_halfpixvar16x16_h vpx_variance_halfpixvar16x16_h_media
|
| +#define vpx_variance_halfpixvar16x16_h vpx_variance_halfpixvar16x16_h_c
|
|
|
| uint32_t vpx_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -uint32_t vpx_variance_halfpixvar16x16_hv_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -#define vpx_variance_halfpixvar16x16_hv vpx_variance_halfpixvar16x16_hv_media
|
| +#define vpx_variance_halfpixvar16x16_hv vpx_variance_halfpixvar16x16_hv_c
|
|
|
| uint32_t vpx_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -uint32_t vpx_variance_halfpixvar16x16_v_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse);
|
| -#define vpx_variance_halfpixvar16x16_v vpx_variance_halfpixvar16x16_v_media
|
| +#define vpx_variance_halfpixvar16x16_v vpx_variance_halfpixvar16x16_v_c
|
|
|
| void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
| #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c
|
|
|