summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/x86/recon_sse2.asm22
-rw-r--r--vp8/common/x86/recon_wrapper_sse2.c10
2 files changed, 9 insertions, 23 deletions
diff --git a/vp8/common/x86/recon_sse2.asm b/vp8/common/x86/recon_sse2.asm
index a1cc2b1fe..97dc4f686 100644
--- a/vp8/common/x86/recon_sse2.asm
+++ b/vp8/common/x86/recon_sse2.asm
@@ -251,15 +251,8 @@ sym(vp8_intra_pred_uv_dc_mmx2):
movsxd rax, dword ptr arg(3) ;src_stride;
sub rsi, rax
pxor mm0, mm0
- movd mm1, [rsi]
- movd mm2, [rsi+4]
- punpcklbw mm1, mm0
- punpcklbw mm2, mm0
- paddw mm1, mm2
- pshufw mm2, mm1, 0x0e
- paddw mm1, mm2
- pshufw mm2, mm1, 0x01
- paddw mm1, mm2
+ movq mm1, [rsi]
+ psadbw mm1, mm0
; from left
dec rsi
@@ -331,15 +324,8 @@ sym(vp8_intra_pred_uv_dctop_mmx2):
movsxd rax, dword ptr arg(3) ;src_stride;
sub rsi, rax
pxor mm0, mm0
- movd mm1, [rsi]
- movd mm2, [rsi+4]
- punpcklbw mm1, mm0
- punpcklbw mm2, mm0
- paddw mm1, mm2
- pshufw mm2, mm1, 0x0e
- paddw mm1, mm2
- pshufw mm2, mm1, 0x01
- paddw mm1, mm2
+ movq mm1, [rsi]
+ psadbw mm1, mm0
; add up
paddw mm1, [GLOBAL(dc_4)]
diff --git a/vp8/common/x86/recon_wrapper_sse2.c b/vp8/common/x86/recon_wrapper_sse2.c
index 7b17851b5..86b4da2c2 100644
--- a/vp8/common/x86/recon_wrapper_sse2.c
+++ b/vp8/common/x86/recon_wrapper_sse2.c
@@ -27,11 +27,11 @@ extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_uv_ve_mmx);
extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_uv_tm_sse2);
extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_uv_tm_ssse3);
-static inline void vp8_build_intra_predictors_mbuv_x86(MACROBLOCKD *x,
- unsigned char *dst_u,
- unsigned char *dst_v,
- int dst_stride,
- build_intra_predictors_mbuv_fn_t tm_func)
+static void vp8_build_intra_predictors_mbuv_x86(MACROBLOCKD *x,
+ unsigned char *dst_u,
+ unsigned char *dst_v,
+ int dst_stride,
+ build_intra_predictors_mbuv_fn_t tm_func)
{
int mode = x->mode_info_context->mbmi.uv_mode;
build_intra_predictors_mbuv_fn_t fn;