Index: source/config/mac/ia32/vp8_rtcd.h |
diff --git a/source/config/mac/ia32/vp8_rtcd.h b/source/config/mac/ia32/vp8_rtcd.h |
index b60e7ac730118c8b533daa83d294864199940c86..56c68edb1e0361b6995cf7e5ce986fadfe16103b 100644 |
--- a/source/config/mac/ia32/vp8_rtcd.h |
+++ b/source/config/mac/ia32/vp8_rtcd.h |
@@ -74,10 +74,10 @@ void vp8_clear_system_state_c(); |
void vpx_reset_mmx_state(); |
RTCD_EXTERN void (*vp8_clear_system_state)(); |
-void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); |
-void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); |
-void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); |
-RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); |
+void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n); |
+void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n); |
+void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n); |
+RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n); |
void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); |
void vp8_copy_mem16x16_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); |
@@ -147,15 +147,6 @@ int vp8_full_search_sadx3(struct macroblock *x, struct block *b, struct blockd * |
int vp8_full_search_sadx8(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); |
RTCD_EXTERN int (*vp8_full_search_sad)(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); |
-unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); |
-unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); |
-RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); |
- |
-unsigned int vp8_get_mb_ss_c(const short *); |
-unsigned int vp8_get_mb_ss_mmx(const short *); |
-unsigned int vp8_get_mb_ss_sse2(const short *); |
-RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); |
- |
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); |
#define vp8_intra4x4_predict vp8_intra4x4_predict_c |
@@ -218,11 +209,6 @@ int vp8_mbuverror_mmx(struct macroblock *mb); |
int vp8_mbuverror_xmm(struct macroblock *mb); |
RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb); |
-unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
void vp8_plane_add_noise_c(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch); |
void vp8_plane_add_noise_mmx(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch); |
void vp8_plane_add_noise_wmt(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch); |
@@ -337,31 +323,6 @@ void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, unsig |
void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride); |
RTCD_EXTERN void (*vp8_subtract_mby)(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride); |
-unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_variance16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
-unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance16x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance16x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_variance16x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
-unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_variance4x4)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
-unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance8x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance8x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_variance8x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
-unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance8x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-unsigned int vp8_variance8x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
-RTCD_EXTERN unsigned int (*vp8_variance8x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
- |
unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
unsigned int vp8_variance_halfpixvar16x16_h_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
unsigned int vp8_variance_halfpixvar16x16_h_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); |
@@ -448,11 +409,6 @@ static void setup_rtcd_internal(void) |
vp8_full_search_sad = vp8_full_search_sad_c; |
if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; |
if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; |
- vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; |
- if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; |
- vp8_get_mb_ss = vp8_get_mb_ss_c; |
- if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; |
- if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; |
vp8_loop_filter_bh = vp8_loop_filter_bh_c; |
if (flags & HAS_MMX) vp8_loop_filter_bh = vp8_loop_filter_bh_mmx; |
if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; |
@@ -488,9 +444,6 @@ static void setup_rtcd_internal(void) |
vp8_mbuverror = vp8_mbuverror_c; |
if (flags & HAS_MMX) vp8_mbuverror = vp8_mbuverror_mmx; |
if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_xmm; |
- vp8_mse16x16 = vp8_mse16x16_c; |
- if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; |
- if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; |
vp8_plane_add_noise = vp8_plane_add_noise_c; |
if (flags & HAS_MMX) vp8_plane_add_noise = vp8_plane_add_noise_mmx; |
if (flags & HAS_SSE2) vp8_plane_add_noise = vp8_plane_add_noise_wmt; |
@@ -558,21 +511,6 @@ static void setup_rtcd_internal(void) |
vp8_subtract_mby = vp8_subtract_mby_c; |
if (flags & HAS_MMX) vp8_subtract_mby = vp8_subtract_mby_mmx; |
if (flags & HAS_SSE2) vp8_subtract_mby = vp8_subtract_mby_sse2; |
- vp8_variance16x16 = vp8_variance16x16_c; |
- if (flags & HAS_MMX) vp8_variance16x16 = vp8_variance16x16_mmx; |
- if (flags & HAS_SSE2) vp8_variance16x16 = vp8_variance16x16_wmt; |
- vp8_variance16x8 = vp8_variance16x8_c; |
- if (flags & HAS_MMX) vp8_variance16x8 = vp8_variance16x8_mmx; |
- if (flags & HAS_SSE2) vp8_variance16x8 = vp8_variance16x8_wmt; |
- vp8_variance4x4 = vp8_variance4x4_c; |
- if (flags & HAS_MMX) vp8_variance4x4 = vp8_variance4x4_mmx; |
- if (flags & HAS_SSE2) vp8_variance4x4 = vp8_variance4x4_wmt; |
- vp8_variance8x16 = vp8_variance8x16_c; |
- if (flags & HAS_MMX) vp8_variance8x16 = vp8_variance8x16_mmx; |
- if (flags & HAS_SSE2) vp8_variance8x16 = vp8_variance8x16_wmt; |
- vp8_variance8x8 = vp8_variance8x8_c; |
- if (flags & HAS_MMX) vp8_variance8x8 = vp8_variance8x8_mmx; |
- if (flags & HAS_SSE2) vp8_variance8x8 = vp8_variance8x8_wmt; |
vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_c; |
if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_mmx; |
if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_wmt; |