generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade libvpx to dba0538.

Browse Source 
BUG=
TEST=

Review URL: https://webrtc-codereview.appspot.com/521002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2119 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2012-04-25 19:16:00 +00:00
parent ad929899c7
commit da12dde4d2
25 changed files with 501 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm vendored
View File

@@ -17,12 +17,11 @@ vp8_block_src_stride EQU 44
vp8_blockd_predictor EQU 8
vp8_writer_lowvalue EQU 0
vp8_writer_range EQU 4
vp8_writer_value EQU 8
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 20
vp8_writer_buffer_end EQU 24
vp8_writer_error EQU 28
vp8_writer_count EQU 8
vp8_writer_pos EQU 12
vp8_writer_buffer EQU 16
vp8_writer_buffer_end EQU 20
vp8_writer_error EQU 24
tokenextra_token EQU 6
tokenextra_extra EQU 4
tokenextra_context_tree EQU 0
@@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0
vp8_extra_bit_struct_prob EQU 4
vp8_extra_bit_struct_len EQU 8
vp8_extra_bit_struct_base_val EQU 12
vp8_comp_tplist EQU 170616
vp8_comp_tplist EQU 170580
vp8_comp_common EQU 104032
vp8_comp_bc EQU 116160
vp8_writer_sz EQU 40
vp8_writer_sz EQU 36
tokenlist_start EQU 0
tokenlist_stop EQU 4
TOKENLIST_SZ EQU 8

122
third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h vendored
View File

@@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in
void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
void vp8_build_intra_predictors_mby_c(struct macroblockd *x);
void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x);
void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x);
RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x);
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_sse2(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_ssse3(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_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr);
#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c
void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x);
void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x);
void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x);
RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x);
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);
#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_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_sse2(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_ssse3(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_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride);
#define vp8_intra4x4_predict vp8_intra4x4_predict_c
@@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
#define vp8_blend_b vp8_blend_b_c
void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
@@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i
unsigned int vp8_variance_halfpixvar16x16_hv_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_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse);
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 *);
unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
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);
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_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
@@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned
void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array);
RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array);
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 *);
unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
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);
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);
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);
@@ -535,15 +540,13 @@ void vpx_rtcd(void)
vp8_copy_mem8x4 = vp8_copy_mem8x4_c;
if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx;
vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_c;
if (flags & HAS_SSE2) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3;
vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_c;
if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3;
vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c;
if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c;
if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
vp8_mbpost_proc_down = vp8_mbpost_proc_down_c;
@@ -564,6 +567,13 @@ void vpx_rtcd(void)
vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c;
if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2;
vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c;
if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2;
vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx;
if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
@@ -653,21 +663,6 @@ void vpx_rtcd(void)
if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx;
if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt;
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_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c;
if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx;
if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt;
vp8_mse16x16 = vp8_mse16x16_c;
if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx;
if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt;
vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx;
vp8_sad4x4 = vp8_sad4x4_c;
if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx;
if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt;
@@ -736,6 +731,21 @@ void vpx_rtcd(void)
vp8_sad16x16x4d = vp8_sad16x16x4d_c;
if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
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_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c;
if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx;
if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt;
vp8_mse16x16 = vp8_mse16x16_c;
if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx;
if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt;
vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx;
vp8_copy32xn = vp8_copy32xn_c;
if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2;
if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;

6
third_party/libvpx/source/config/mac/ia32/vpx_version.h vendored
View File

@@ -1,7 +1,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_PATCH 0
#define VERSION_EXTRA "108-g6b66c01"
#define VERSION_EXTRA "169-gdba0538"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01"
#define VERSION_STRING " v1.0.0-108-g6b66c01"
#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538"
#define VERSION_STRING " v1.0.0-169-gdba0538"

15
third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm vendored
View File

@@ -17,12 +17,11 @@ vp8_block_src_stride EQU 84
vp8_blockd_predictor EQU 16
vp8_writer_lowvalue EQU 0
vp8_writer_range EQU 4
vp8_writer_value EQU 8
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 24
vp8_writer_buffer_end EQU 32
vp8_writer_error EQU 40
vp8_writer_count EQU 8
vp8_writer_pos EQU 12
vp8_writer_buffer EQU 16
vp8_writer_buffer_end EQU 24
vp8_writer_error EQU 32
tokenextra_token EQU 10
tokenextra_extra EQU 8
tokenextra_context_tree EQU 0
@@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0
vp8_extra_bit_struct_prob EQU 8
vp8_extra_bit_struct_len EQU 16
vp8_extra_bit_struct_base_val EQU 20
vp8_comp_tplist EQU 173120
vp8_comp_tplist EQU 173056
vp8_comp_common EQU 105920
vp8_comp_bc EQU 118288
vp8_writer_sz EQU 64
vp8_writer_sz EQU 56
tokenlist_start EQU 0
tokenlist_stop EQU 8
TOKENLIST_SZ EQU 16

88
third_party/libvpx/source/config/mac/x64/vpx_rtcd.h vendored
View File

@@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in
void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
#define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx
void vp8_build_intra_predictors_mby_c(struct macroblockd *x);
void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x);
void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x);
RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x);
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_sse2(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_ssse3(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_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr);
#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c
void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x);
void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x);
void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x);
RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x);
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);
#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_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_sse2(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_ssse3(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_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride);
#define vp8_intra4x4_predict vp8_intra4x4_predict_c
@@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
#define vp8_blend_b vp8_blend_b_c
void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2
void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2
void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
@@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i
unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse);
#define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt
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 *);
#define vp8_get_mb_ss vp8_get_mb_ss_sse2
unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt
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);
#define vp8_mse16x16 vp8_mse16x16_wmt
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);
#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx
unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
@@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned
void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array);
RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array);
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 *);
#define vp8_get_mb_ss vp8_get_mb_ss_sse2
unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt
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);
#define vp8_mse16x16 vp8_mse16x16_wmt
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);
#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx
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);
@@ -487,12 +492,13 @@ void vpx_rtcd(void)
vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3;
vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2;
if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3;
@@ -544,10 +550,6 @@ void vpx_rtcd(void)
vp8_sad16x16 = vp8_sad16x16_wmt;
if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3;
@@ -598,6 +600,10 @@ void vpx_rtcd(void)
vp8_sad16x16x4d = vp8_sad16x16x4d_c;
if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
vp8_copy32xn = vp8_copy32xn_sse2;
if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;

6
third_party/libvpx/source/config/mac/x64/vpx_version.h vendored
View File

@@ -1,7 +1,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_PATCH 0
#define VERSION_EXTRA "108-g6b66c01"
#define VERSION_EXTRA "169-gdba0538"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01"
#define VERSION_STRING " v1.0.0-108-g6b66c01"
#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538"
#define VERSION_STRING " v1.0.0-169-gdba0538"