| Index: third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
|
| diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
|
| index 958117259437333939e2949de5160466d6ddab4e..d3dd918c490c42b926aa76a7381d96024ccb6fa7 100644
|
| --- a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
|
| +++ b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
|
| @@ -309,12 +309,10 @@ unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride,
|
| #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c
|
|
|
| void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
|
| -void vpx_get8x8var_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
|
| void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
|
| RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
|
|
|
| unsigned int vpx_get_mb_ss_c(const int16_t *);
|
| -unsigned int vpx_get_mb_ss_mmx(const int16_t *);
|
| unsigned int vpx_get_mb_ss_sse2(const int16_t *);
|
| RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t *);
|
|
|
| @@ -463,7 +461,6 @@ void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, int
|
| RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
|
|
|
| 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_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
|
| @@ -493,7 +490,6 @@ 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_mmx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
|
|
| @@ -527,7 +523,6 @@ void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t
|
| RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
|
|
|
| unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -unsigned int vpx_sad16x8_mmx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
|
|
| @@ -598,7 +593,6 @@ void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t
|
| RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
|
|
|
| unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -unsigned int vpx_sad4x4_mmx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
|
|
| @@ -669,7 +663,6 @@ void vpx_sad64x64x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref
|
| #define vpx_sad64x64x8 vpx_sad64x64x8_c
|
|
|
| unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -unsigned int vpx_sad8x16_mmx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
|
|
| @@ -705,7 +698,6 @@ void vpx_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_p
|
| #define vpx_sad8x4x8 vpx_sad8x4x8_c
|
|
|
| unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| -unsigned int vpx_sad8x8_mmx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
| RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
|
|
| @@ -924,7 +916,6 @@ void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *a
|
| RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
|
|
| 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_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| @@ -934,7 +925,6 @@ unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, c
|
| RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -unsigned int vpx_variance16x8_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| @@ -953,7 +943,6 @@ unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, c
|
| RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -unsigned int vpx_variance4x4_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| @@ -972,7 +961,6 @@ unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, c
|
| RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| -unsigned int vpx_variance8x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| @@ -981,7 +969,6 @@ unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, con
|
| RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| 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_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
| RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
|
|
|
| @@ -1134,10 +1121,8 @@ static void setup_rtcd_internal(void)
|
| if (flags & HAS_SSE2) vpx_get16x16var = vpx_get16x16var_sse2;
|
| if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2;
|
| vpx_get8x8var = vpx_get8x8var_c;
|
| - if (flags & HAS_MMX) vpx_get8x8var = vpx_get8x8var_mmx;
|
| if (flags & HAS_SSE2) vpx_get8x8var = vpx_get8x8var_sse2;
|
| vpx_get_mb_ss = vpx_get_mb_ss_c;
|
| - if (flags & HAS_MMX) vpx_get_mb_ss = vpx_get_mb_ss_mmx;
|
| if (flags & HAS_SSE2) vpx_get_mb_ss = vpx_get_mb_ss_sse2;
|
| vpx_h_predictor_16x16 = vpx_h_predictor_16x16_c;
|
| if (flags & HAS_SSE2) vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2;
|
| @@ -1210,7 +1195,6 @@ static void setup_rtcd_internal(void)
|
| vpx_minmax_8x8 = vpx_minmax_8x8_c;
|
| if (flags & HAS_SSE2) vpx_minmax_8x8 = vpx_minmax_8x8_sse2;
|
| vpx_mse16x16 = vpx_mse16x16_c;
|
| - if (flags & HAS_MMX) vpx_mse16x16 = vpx_mse16x16_mmx;
|
| if (flags & HAS_SSE2) vpx_mse16x16 = vpx_mse16x16_sse2;
|
| if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2;
|
| vpx_mse16x8 = vpx_mse16x8_c;
|
| @@ -1225,7 +1209,6 @@ static void setup_rtcd_internal(void)
|
| vpx_quantize_b = vpx_quantize_b_c;
|
| if (flags & HAS_SSE2) vpx_quantize_b = vpx_quantize_b_sse2;
|
| vpx_sad16x16 = vpx_sad16x16_c;
|
| - if (flags & HAS_MMX) vpx_sad16x16 = vpx_sad16x16_mmx;
|
| if (flags & HAS_SSE2) vpx_sad16x16 = vpx_sad16x16_sse2;
|
| vpx_sad16x16_avg = vpx_sad16x16_avg_c;
|
| if (flags & HAS_SSE2) vpx_sad16x16_avg = vpx_sad16x16_avg_sse2;
|
| @@ -1243,7 +1226,6 @@ static void setup_rtcd_internal(void)
|
| vpx_sad16x32x4d = vpx_sad16x32x4d_c;
|
| if (flags & HAS_SSE2) vpx_sad16x32x4d = vpx_sad16x32x4d_sse2;
|
| vpx_sad16x8 = vpx_sad16x8_c;
|
| - if (flags & HAS_MMX) vpx_sad16x8 = vpx_sad16x8_mmx;
|
| if (flags & HAS_SSE2) vpx_sad16x8 = vpx_sad16x8_sse2;
|
| vpx_sad16x8_avg = vpx_sad16x8_avg_c;
|
| if (flags & HAS_SSE2) vpx_sad16x8_avg = vpx_sad16x8_avg_sse2;
|
| @@ -1280,7 +1262,6 @@ static void setup_rtcd_internal(void)
|
| vpx_sad32x64x4d = vpx_sad32x64x4d_c;
|
| if (flags & HAS_SSE2) vpx_sad32x64x4d = vpx_sad32x64x4d_sse2;
|
| vpx_sad4x4 = vpx_sad4x4_c;
|
| - if (flags & HAS_MMX) vpx_sad4x4 = vpx_sad4x4_mmx;
|
| if (flags & HAS_SSE2) vpx_sad4x4 = vpx_sad4x4_sse2;
|
| vpx_sad4x4_avg = vpx_sad4x4_avg_c;
|
| if (flags & HAS_SSE2) vpx_sad4x4_avg = vpx_sad4x4_avg_sse2;
|
| @@ -1314,7 +1295,6 @@ static void setup_rtcd_internal(void)
|
| if (flags & HAS_SSE2) vpx_sad64x64x4d = vpx_sad64x64x4d_sse2;
|
| if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2;
|
| vpx_sad8x16 = vpx_sad8x16_c;
|
| - if (flags & HAS_MMX) vpx_sad8x16 = vpx_sad8x16_mmx;
|
| if (flags & HAS_SSE2) vpx_sad8x16 = vpx_sad8x16_sse2;
|
| vpx_sad8x16_avg = vpx_sad8x16_avg_c;
|
| if (flags & HAS_SSE2) vpx_sad8x16_avg = vpx_sad8x16_avg_sse2;
|
| @@ -1331,7 +1311,6 @@ static void setup_rtcd_internal(void)
|
| vpx_sad8x4x4d = vpx_sad8x4x4d_c;
|
| if (flags & HAS_SSE2) vpx_sad8x4x4d = vpx_sad8x4x4d_sse2;
|
| vpx_sad8x8 = vpx_sad8x8_c;
|
| - if (flags & HAS_MMX) vpx_sad8x8 = vpx_sad8x8_mmx;
|
| if (flags & HAS_SSE2) vpx_sad8x8 = vpx_sad8x8_sse2;
|
| vpx_sad8x8_avg = vpx_sad8x8_avg_c;
|
| if (flags & HAS_SSE2) vpx_sad8x8_avg = vpx_sad8x8_avg_sse2;
|
| @@ -1451,13 +1430,11 @@ static void setup_rtcd_internal(void)
|
| vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c;
|
| if (flags & HAS_SSE2) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2;
|
| vpx_variance16x16 = vpx_variance16x16_c;
|
| - if (flags & HAS_MMX) vpx_variance16x16 = vpx_variance16x16_mmx;
|
| if (flags & HAS_SSE2) vpx_variance16x16 = vpx_variance16x16_sse2;
|
| if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2;
|
| vpx_variance16x32 = vpx_variance16x32_c;
|
| if (flags & HAS_SSE2) vpx_variance16x32 = vpx_variance16x32_sse2;
|
| vpx_variance16x8 = vpx_variance16x8_c;
|
| - if (flags & HAS_MMX) vpx_variance16x8 = vpx_variance16x8_mmx;
|
| if (flags & HAS_SSE2) vpx_variance16x8 = vpx_variance16x8_sse2;
|
| vpx_variance32x16 = vpx_variance32x16_c;
|
| if (flags & HAS_SSE2) vpx_variance32x16 = vpx_variance32x16_sse2;
|
| @@ -1468,7 +1445,6 @@ static void setup_rtcd_internal(void)
|
| vpx_variance32x64 = vpx_variance32x64_c;
|
| if (flags & HAS_SSE2) vpx_variance32x64 = vpx_variance32x64_sse2;
|
| vpx_variance4x4 = vpx_variance4x4_c;
|
| - if (flags & HAS_MMX) vpx_variance4x4 = vpx_variance4x4_mmx;
|
| if (flags & HAS_SSE2) vpx_variance4x4 = vpx_variance4x4_sse2;
|
| vpx_variance4x8 = vpx_variance4x8_c;
|
| if (flags & HAS_SSE2) vpx_variance4x8 = vpx_variance4x8_sse2;
|
| @@ -1479,12 +1455,10 @@ static void setup_rtcd_internal(void)
|
| if (flags & HAS_SSE2) vpx_variance64x64 = vpx_variance64x64_sse2;
|
| if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2;
|
| vpx_variance8x16 = vpx_variance8x16_c;
|
| - if (flags & HAS_MMX) vpx_variance8x16 = vpx_variance8x16_mmx;
|
| if (flags & HAS_SSE2) vpx_variance8x16 = vpx_variance8x16_sse2;
|
| vpx_variance8x4 = vpx_variance8x4_c;
|
| if (flags & HAS_SSE2) vpx_variance8x4 = vpx_variance8x4_sse2;
|
| vpx_variance8x8 = vpx_variance8x8_c;
|
| - if (flags & HAS_MMX) vpx_variance8x8 = vpx_variance8x8_mmx;
|
| if (flags & HAS_SSE2) vpx_variance8x8 = vpx_variance8x8_sse2;
|
| vpx_variance_halfpixvar16x16_h = vpx_variance_halfpixvar16x16_h_c;
|
| if (flags & HAS_MMX) vpx_variance_halfpixvar16x16_h = vpx_variance_halfpixvar16x16_h_mmx;
|
|
|