Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/config/linux/ia32/vp9_rtcd.h

Issue 554673004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/config/linux/ia32/vp8_rtcd.h ('k') | source/config/linux/ia32/vpx_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/config/linux/ia32/vp9_rtcd.h
===================================================================
--- source/config/linux/ia32/vp9_rtcd.h (revision 291857)
+++ source/config/linux/ia32/vp9_rtcd.h (working copy)
@@ -28,15 +28,6 @@
union int_mv;
struct yv12_buffer_config;
-void vp9_blend_b_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp9_blend_b vp9_blend_b_c
-
-void vp9_blend_mb_inner_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp9_blend_mb_inner vp9_blend_mb_inner_c
-
-void vp9_blend_mb_outer_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp9_blend_mb_outer vp9_blend_mb_outer_c
-
int64_t vp9_block_error_c(const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size, int64_t *ssz);
int64_t vp9_block_error_sse2(const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size, int64_t *ssz);
RTCD_EXTERN int64_t (*vp9_block_error)(const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size, int64_t *ssz);
@@ -286,12 +277,10 @@
RTCD_EXTERN void (*vp9_get16x16var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
void vp9_get8x8var_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_mmx(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_get8x8var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
unsigned int vp9_get_mb_ss_c(const int16_t *);
-unsigned int vp9_get_mb_ss_mmx(const int16_t *);
unsigned int vp9_get_mb_ss_sse2(const int16_t *);
RTCD_EXTERN unsigned int (*vp9_get_mb_ss)(const int16_t *);
@@ -420,18 +409,20 @@
RTCD_EXTERN void (*vp9_lpf_vertical_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
-unsigned int vp9_mse16x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
unsigned int vp9_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
RTCD_EXTERN unsigned int (*vp9_mse16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
-#define vp9_mse16x8 vp9_mse16x8_c
+unsigned int vp9_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
-#define vp9_mse8x16 vp9_mse8x16_c
+unsigned int vp9_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
-#define vp9_mse8x8 vp9_mse8x8_c
+unsigned int vp9_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse);
void vp9_quantize_b_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
#define vp9_quantize_b vp9_quantize_b_c
@@ -449,7 +440,6 @@
#define vp9_refining_search_sad vp9_refining_search_sad_c
unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad16x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
unsigned int vp9_sad16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
RTCD_EXTERN unsigned int (*vp9_sad16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
@@ -482,7 +472,6 @@
RTCD_EXTERN void (*vp9_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad16x8_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
unsigned int vp9_sad16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
RTCD_EXTERN unsigned int (*vp9_sad16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
@@ -545,7 +534,6 @@
RTCD_EXTERN void (*vp9_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad4x4_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
unsigned int vp9_sad4x4_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
RTCD_EXTERN unsigned int (*vp9_sad4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
@@ -610,7 +598,6 @@
#define vp9_sad64x64x8 vp9_sad64x64x8_c
unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad8x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
unsigned int vp9_sad8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
RTCD_EXTERN unsigned int (*vp9_sad8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
@@ -645,7 +632,6 @@
#define vp9_sad8x4x8 vp9_sad8x4x8_c
unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad8x8_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
unsigned int vp9_sad8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
RTCD_EXTERN unsigned int (*vp9_sad8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
@@ -834,7 +820,6 @@
RTCD_EXTERN void (*vp9_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
RTCD_EXTERN unsigned int (*vp9_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -843,7 +828,6 @@
RTCD_EXTERN unsigned int (*vp9_variance16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x8_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_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 (*vp9_variance16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -860,7 +844,6 @@
RTCD_EXTERN unsigned int (*vp9_variance32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance4x4_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_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 (*vp9_variance4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -877,7 +860,6 @@
RTCD_EXTERN unsigned int (*vp9_variance64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x16_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_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 (*vp9_variance8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -886,7 +868,6 @@
RTCD_EXTERN unsigned int (*vp9_variance8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x8_mmx(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
unsigned int vp9_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 (*vp9_variance8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -994,10 +975,8 @@
vp9_get16x16var = vp9_get16x16var_c;
if (flags & HAS_SSE2) vp9_get16x16var = vp9_get16x16var_sse2;
vp9_get8x8var = vp9_get8x8var_c;
- if (flags & HAS_MMX) vp9_get8x8var = vp9_get8x8var_mmx;
if (flags & HAS_SSE2) vp9_get8x8var = vp9_get8x8var_sse2;
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_h_predictor_16x16 = vp9_h_predictor_16x16_c;
if (flags & HAS_SSSE3) vp9_h_predictor_16x16 = vp9_h_predictor_16x16_ssse3;
@@ -1060,10 +1039,14 @@
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;
if (flags & HAS_SSE2) vp9_mse16x16 = vp9_mse16x16_sse2;
+ vp9_mse16x8 = vp9_mse16x8_c;
+ if (flags & HAS_SSE2) vp9_mse16x8 = vp9_mse16x8_sse2;
+ vp9_mse8x16 = vp9_mse8x16_c;
+ if (flags & HAS_SSE2) vp9_mse8x16 = vp9_mse8x16_sse2;
+ vp9_mse8x8 = vp9_mse8x8_c;
+ if (flags & HAS_SSE2) vp9_mse8x8 = vp9_mse8x8_sse2;
vp9_sad16x16 = vp9_sad16x16_c;
- if (flags & HAS_MMX) vp9_sad16x16 = vp9_sad16x16_mmx;
if (flags & HAS_SSE2) vp9_sad16x16 = vp9_sad16x16_sse2;
vp9_sad16x16_avg = vp9_sad16x16_avg_c;
if (flags & HAS_SSE2) vp9_sad16x16_avg = vp9_sad16x16_avg_sse2;
@@ -1079,7 +1062,6 @@
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;
if (flags & HAS_SSE2) vp9_sad16x8 = vp9_sad16x8_sse2;
vp9_sad16x8_avg = vp9_sad16x8_avg_c;
if (flags & HAS_SSE2) vp9_sad16x8_avg = vp9_sad16x8_avg_sse2;
@@ -1107,7 +1089,6 @@
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;
if (flags & HAS_SSE) vp9_sad4x4 = vp9_sad4x4_sse;
vp9_sad4x4_avg = vp9_sad4x4_avg_c;
if (flags & HAS_SSE) vp9_sad4x4_avg = vp9_sad4x4_avg_sse;
@@ -1134,7 +1115,6 @@
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;
if (flags & HAS_SSE2) vp9_sad8x16 = vp9_sad8x16_sse2;
vp9_sad8x16_avg = vp9_sad8x16_avg_c;
if (flags & HAS_SSE2) vp9_sad8x16_avg = vp9_sad8x16_avg_sse2;
@@ -1149,7 +1129,6 @@
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;
if (flags & HAS_SSE2) vp9_sad8x8 = vp9_sad8x8_sse2;
vp9_sad8x8_avg = vp9_sad8x8_avg_c;
if (flags & HAS_SSE2) vp9_sad8x8_avg = vp9_sad8x8_avg_sse2;
@@ -1254,12 +1233,10 @@
vp9_v_predictor_8x8 = vp9_v_predictor_8x8_c;
if (flags & HAS_SSE) vp9_v_predictor_8x8 = vp9_v_predictor_8x8_sse;
vp9_variance16x16 = vp9_variance16x16_c;
- if (flags & HAS_MMX) vp9_variance16x16 = vp9_variance16x16_mmx;
if (flags & HAS_SSE2) vp9_variance16x16 = vp9_variance16x16_sse2;
vp9_variance16x32 = vp9_variance16x32_c;
if (flags & HAS_SSE2) vp9_variance16x32 = vp9_variance16x32_sse2;
vp9_variance16x8 = vp9_variance16x8_c;
- if (flags & HAS_MMX) vp9_variance16x8 = vp9_variance16x8_mmx;
if (flags & HAS_SSE2) vp9_variance16x8 = vp9_variance16x8_sse2;
vp9_variance32x16 = vp9_variance32x16_c;
if (flags & HAS_SSE2) vp9_variance32x16 = vp9_variance32x16_sse2;
@@ -1268,7 +1245,6 @@
vp9_variance32x64 = vp9_variance32x64_c;
if (flags & HAS_SSE2) vp9_variance32x64 = vp9_variance32x64_sse2;
vp9_variance4x4 = vp9_variance4x4_c;
- if (flags & HAS_MMX) vp9_variance4x4 = vp9_variance4x4_mmx;
if (flags & HAS_SSE2) vp9_variance4x4 = vp9_variance4x4_sse2;
vp9_variance4x8 = vp9_variance4x8_c;
if (flags & HAS_SSE2) vp9_variance4x8 = vp9_variance4x8_sse2;
@@ -1277,12 +1253,10 @@
vp9_variance64x64 = vp9_variance64x64_c;
if (flags & HAS_SSE2) vp9_variance64x64 = vp9_variance64x64_sse2;
vp9_variance8x16 = vp9_variance8x16_c;
- if (flags & HAS_MMX) vp9_variance8x16 = vp9_variance8x16_mmx;
if (flags & HAS_SSE2) vp9_variance8x16 = vp9_variance8x16_sse2;
vp9_variance8x4 = vp9_variance8x4_c;
if (flags & HAS_SSE2) vp9_variance8x4 = vp9_variance8x4_sse2;
vp9_variance8x8 = vp9_variance8x8_c;
- if (flags & HAS_MMX) vp9_variance8x8 = vp9_variance8x8_mmx;
if (flags & HAS_SSE2) vp9_variance8x8 = vp9_variance8x8_sse2;
}
#endif
« no previous file with comments | « source/config/linux/ia32/vp8_rtcd.h ('k') | source/config/linux/ia32/vpx_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698