Index: source/config/mac/ia32/vp9_rtcd.h |
=================================================================== |
--- source/config/mac/ia32/vp9_rtcd.h (revision 261575) |
+++ source/config/mac/ia32/vp9_rtcd.h (working copy) |
@@ -249,6 +249,10 @@ |
unsigned int vp9_get_mb_ss_sse2(const int16_t *); |
RTCD_EXTERN unsigned int (*vp9_get_mb_ss)(const int16_t *); |
+void vp9_get_sse_sum_16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); |
+void vp9_get16x16var_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 (*vp9_get_sse_sum_16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); |
+ |
void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); |
void vp9_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 (*vp9_get_sse_sum_8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); |
@@ -780,371 +784,164 @@ |
(void)flags; |
- |
- |
- |
- |
vp9_convolve8 = vp9_convolve8_c; |
if (flags & HAS_SSE2) vp9_convolve8 = vp9_convolve8_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8 = vp9_convolve8_ssse3; |
- |
vp9_convolve8_avg = vp9_convolve8_avg_c; |
if (flags & HAS_SSE2) vp9_convolve8_avg = vp9_convolve8_avg_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8_avg = vp9_convolve8_avg_ssse3; |
- |
vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_c; |
if (flags & HAS_SSE2) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_ssse3; |
- |
vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_c; |
if (flags & HAS_SSE2) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_ssse3; |
- |
vp9_convolve8_horiz = vp9_convolve8_horiz_c; |
if (flags & HAS_SSE2) vp9_convolve8_horiz = vp9_convolve8_horiz_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8_horiz = vp9_convolve8_horiz_ssse3; |
- |
vp9_convolve8_vert = vp9_convolve8_vert_c; |
if (flags & HAS_SSE2) vp9_convolve8_vert = vp9_convolve8_vert_sse2; |
if (flags & HAS_SSSE3) vp9_convolve8_vert = vp9_convolve8_vert_ssse3; |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
vp9_diamond_search_sad = vp9_diamond_search_sad_c; |
if (flags & HAS_SSE3) vp9_diamond_search_sad = vp9_diamond_search_sadx4; |
- |
vp9_fdct16x16 = vp9_fdct16x16_c; |
if (flags & HAS_SSE2) vp9_fdct16x16 = vp9_fdct16x16_sse2; |
- |
vp9_fdct32x32 = vp9_fdct32x32_c; |
if (flags & HAS_SSE2) vp9_fdct32x32 = vp9_fdct32x32_sse2; |
- |
vp9_fdct32x32_rd = vp9_fdct32x32_rd_c; |
if (flags & HAS_SSE2) vp9_fdct32x32_rd = vp9_fdct32x32_rd_sse2; |
- |
vp9_fdct4x4 = vp9_fdct4x4_c; |
if (flags & HAS_SSE2) vp9_fdct4x4 = vp9_fdct4x4_sse2; |
- |
vp9_fdct8x8 = vp9_fdct8x8_c; |
if (flags & HAS_SSE2) vp9_fdct8x8 = vp9_fdct8x8_sse2; |
- |
vp9_fht16x16 = vp9_fht16x16_c; |
if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2; |
- |
vp9_fht4x4 = vp9_fht4x4_c; |
if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2; |
- |
vp9_fht8x8 = vp9_fht8x8_c; |
if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2; |
- |
- |
vp9_full_search_sad = vp9_full_search_sad_c; |
if (flags & HAS_SSE3) vp9_full_search_sad = vp9_full_search_sadx3; |
if (flags & HAS_SSE4_1) vp9_full_search_sad = vp9_full_search_sadx8; |
- |
- |
vp9_get_mb_ss = vp9_get_mb_ss_c; |
if (flags & HAS_MMX) vp9_get_mb_ss = vp9_get_mb_ss_mmx; |
if (flags & HAS_SSE2) vp9_get_mb_ss = vp9_get_mb_ss_sse2; |
- |
+ vp9_get_sse_sum_16x16 = vp9_get_sse_sum_16x16_c; |
+ if (flags & HAS_SSE2) vp9_get_sse_sum_16x16 = vp9_get16x16var_sse2; |
vp9_get_sse_sum_8x8 = vp9_get_sse_sum_8x8_c; |
if (flags & HAS_SSE2) vp9_get_sse_sum_8x8 = vp9_get8x8var_sse2; |
- |
- |
- |
- |
- |
vp9_idct16x16_10_add = vp9_idct16x16_10_add_c; |
if (flags & HAS_SSE2) vp9_idct16x16_10_add = vp9_idct16x16_10_add_sse2; |
- |
vp9_idct16x16_1_add = vp9_idct16x16_1_add_c; |
if (flags & HAS_SSE2) vp9_idct16x16_1_add = vp9_idct16x16_1_add_sse2; |
- |
vp9_idct16x16_256_add = vp9_idct16x16_256_add_c; |
if (flags & HAS_SSE2) vp9_idct16x16_256_add = vp9_idct16x16_256_add_sse2; |
- |
vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_c; |
if (flags & HAS_SSE2) vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_sse2; |
- |
vp9_idct32x32_1_add = vp9_idct32x32_1_add_c; |
if (flags & HAS_SSE2) vp9_idct32x32_1_add = vp9_idct32x32_1_add_sse2; |
- |
vp9_idct32x32_34_add = vp9_idct32x32_34_add_c; |
if (flags & HAS_SSE2) vp9_idct32x32_34_add = vp9_idct32x32_34_add_sse2; |
- |
vp9_idct4x4_16_add = vp9_idct4x4_16_add_c; |
if (flags & HAS_SSE2) vp9_idct4x4_16_add = vp9_idct4x4_16_add_sse2; |
- |
vp9_idct4x4_1_add = vp9_idct4x4_1_add_c; |
if (flags & HAS_SSE2) vp9_idct4x4_1_add = vp9_idct4x4_1_add_sse2; |
- |
vp9_idct8x8_10_add = vp9_idct8x8_10_add_c; |
if (flags & HAS_SSE2) vp9_idct8x8_10_add = vp9_idct8x8_10_add_sse2; |
- |
vp9_idct8x8_1_add = vp9_idct8x8_1_add_c; |
if (flags & HAS_SSE2) vp9_idct8x8_1_add = vp9_idct8x8_1_add_sse2; |
- |
vp9_idct8x8_64_add = vp9_idct8x8_64_add_c; |
if (flags & HAS_SSE2) vp9_idct8x8_64_add = vp9_idct8x8_64_add_sse2; |
- |
vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; |
if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; |
- |
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c; |
if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; |
- |
vp9_iht8x8_64_add = vp9_iht8x8_64_add_c; |
if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; |
- |
- |
- |
vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_c; |
if (flags & HAS_SSE2) vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_sse2; |
- |
vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_c; |
if (flags & HAS_MMX) vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_mmx; |
- |
vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_c; |
if (flags & HAS_SSE2) vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_sse2; |
- |
vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_c; |
if (flags & HAS_SSE2) vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_sse2; |
- |
vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_c; |
if (flags & HAS_SSE2) vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_sse2; |
- |
vp9_lpf_vertical_16 = vp9_lpf_vertical_16_c; |
if (flags & HAS_SSE2) vp9_lpf_vertical_16 = vp9_lpf_vertical_16_sse2; |
- |
vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_c; |
if (flags & HAS_SSE2) vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_sse2; |
- |
vp9_lpf_vertical_4 = vp9_lpf_vertical_4_c; |
if (flags & HAS_MMX) vp9_lpf_vertical_4 = vp9_lpf_vertical_4_mmx; |
- |
vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_c; |
if (flags & HAS_SSE2) vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_sse2; |
- |
vp9_lpf_vertical_8 = vp9_lpf_vertical_8_c; |
if (flags & HAS_SSE2) vp9_lpf_vertical_8 = vp9_lpf_vertical_8_sse2; |
- |
vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_c; |
if (flags & HAS_SSE2) vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_sse2; |
- |
vp9_mse16x16 = vp9_mse16x16_c; |
if (flags & HAS_MMX) vp9_mse16x16 = vp9_mse16x16_mmx; |
- |
- |
- |
- |
- |
- |
vp9_refining_search_sad = vp9_refining_search_sad_c; |
if (flags & HAS_SSE3) vp9_refining_search_sad = vp9_refining_search_sadx4; |
- |
vp9_sad16x16 = vp9_sad16x16_c; |
if (flags & HAS_MMX) vp9_sad16x16 = vp9_sad16x16_mmx; |
- |
- |
vp9_sad16x16x3 = vp9_sad16x16x3_c; |
if (flags & HAS_SSE3) vp9_sad16x16x3 = vp9_sad16x16x3_sse3; |
if (flags & HAS_SSSE3) vp9_sad16x16x3 = vp9_sad16x16x3_ssse3; |
- |
vp9_sad16x16x4d = vp9_sad16x16x4d_c; |
if (flags & HAS_SSE2) vp9_sad16x16x4d = vp9_sad16x16x4d_sse2; |
- |
- |
- |
- |
vp9_sad16x32x4d = vp9_sad16x32x4d_c; |
if (flags & HAS_SSE2) vp9_sad16x32x4d = vp9_sad16x32x4d_sse2; |
- |
vp9_sad16x8 = vp9_sad16x8_c; |
if (flags & HAS_MMX) vp9_sad16x8 = vp9_sad16x8_mmx; |
- |
- |
vp9_sad16x8x3 = vp9_sad16x8x3_c; |
if (flags & HAS_SSE3) vp9_sad16x8x3 = vp9_sad16x8x3_sse3; |
if (flags & HAS_SSSE3) vp9_sad16x8x3 = vp9_sad16x8x3_ssse3; |
- |
vp9_sad16x8x4d = vp9_sad16x8x4d_c; |
if (flags & HAS_SSE2) vp9_sad16x8x4d = vp9_sad16x8x4d_sse2; |
- |
- |
- |
- |
vp9_sad32x16x4d = vp9_sad32x16x4d_c; |
if (flags & HAS_SSE2) vp9_sad32x16x4d = vp9_sad32x16x4d_sse2; |
- |
- |
- |
- |
vp9_sad32x32x4d = vp9_sad32x32x4d_c; |
if (flags & HAS_SSE2) vp9_sad32x32x4d = vp9_sad32x32x4d_sse2; |
- |
- |
- |
- |
vp9_sad32x64x4d = vp9_sad32x64x4d_c; |
if (flags & HAS_SSE2) vp9_sad32x64x4d = vp9_sad32x64x4d_sse2; |
- |
vp9_sad4x4 = vp9_sad4x4_c; |
if (flags & HAS_MMX) vp9_sad4x4 = vp9_sad4x4_mmx; |
- |
- |
vp9_sad4x4x3 = vp9_sad4x4x3_c; |
if (flags & HAS_SSE3) vp9_sad4x4x3 = vp9_sad4x4x3_sse3; |
- |
vp9_sad4x4x4d = vp9_sad4x4x4d_c; |
if (flags & HAS_SSE) vp9_sad4x4x4d = vp9_sad4x4x4d_sse; |
- |
- |
- |
- |
vp9_sad4x8x4d = vp9_sad4x8x4d_c; |
if (flags & HAS_SSE) vp9_sad4x8x4d = vp9_sad4x8x4d_sse; |
- |
- |
- |
- |
vp9_sad64x32x4d = vp9_sad64x32x4d_c; |
if (flags & HAS_SSE2) vp9_sad64x32x4d = vp9_sad64x32x4d_sse2; |
- |
- |
- |
- |
vp9_sad64x64x4d = vp9_sad64x64x4d_c; |
if (flags & HAS_SSE2) vp9_sad64x64x4d = vp9_sad64x64x4d_sse2; |
- |
- |
vp9_sad8x16 = vp9_sad8x16_c; |
if (flags & HAS_MMX) vp9_sad8x16 = vp9_sad8x16_mmx; |
- |
- |
vp9_sad8x16x3 = vp9_sad8x16x3_c; |
if (flags & HAS_SSE3) vp9_sad8x16x3 = vp9_sad8x16x3_sse3; |
- |
vp9_sad8x16x4d = vp9_sad8x16x4d_c; |
if (flags & HAS_SSE2) vp9_sad8x16x4d = vp9_sad8x16x4d_sse2; |
- |
- |
- |
- |
vp9_sad8x4x4d = vp9_sad8x4x4d_c; |
if (flags & HAS_SSE2) vp9_sad8x4x4d = vp9_sad8x4x4d_sse2; |
- |
- |
vp9_sad8x8 = vp9_sad8x8_c; |
if (flags & HAS_MMX) vp9_sad8x8 = vp9_sad8x8_mmx; |
- |
- |
vp9_sad8x8x3 = vp9_sad8x8x3_c; |
if (flags & HAS_SSE3) vp9_sad8x8x3 = vp9_sad8x8x3_sse3; |
- |
vp9_sad8x8x4d = vp9_sad8x8x4d_c; |
if (flags & HAS_SSE2) vp9_sad8x8x4d = vp9_sad8x8x4d_sse2; |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
vp9_temporal_filter_apply = vp9_temporal_filter_apply_c; |
if (flags & HAS_SSE2) vp9_temporal_filter_apply = vp9_temporal_filter_apply_sse2; |
- |
- |
- |
- |
- |
- |
- |
- |
- |
vp9_variance16x16 = vp9_variance16x16_c; |
if (flags & HAS_MMX) vp9_variance16x16 = vp9_variance16x16_mmx; |
- |
- |
vp9_variance16x8 = vp9_variance16x8_c; |
if (flags & HAS_MMX) vp9_variance16x8 = vp9_variance16x8_mmx; |
- |
- |
- |
- |
vp9_variance4x4 = vp9_variance4x4_c; |
if (flags & HAS_MMX) vp9_variance4x4 = vp9_variance4x4_mmx; |
- |
- |
- |
- |
vp9_variance8x16 = vp9_variance8x16_c; |
if (flags & HAS_MMX) vp9_variance8x16 = vp9_variance8x16_mmx; |
- |
- |
vp9_variance8x8 = vp9_variance8x8_c; |
if (flags & HAS_MMX) vp9_variance8x8 = vp9_variance8x8_mmx; |
} |