From 6b41b4414934cc930468ccd5db598dd6ef643987 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 19 Oct 2015 02:25:11 +0100 Subject: huffyuvencdsp: Convert ff_diff_bytes_mmx to yasm Heavily based upon ff_add_bytes by Christophe Gisquet. Reviewed-by: James Almer Signed-off-by: Timothy Gu --- libavcodec/x86/huffyuvencdsp_mmx.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) (limited to 'libavcodec/x86/huffyuvencdsp_mmx.c') diff --git a/libavcodec/x86/huffyuvencdsp_mmx.c b/libavcodec/x86/huffyuvencdsp_mmx.c index ee60f4c573..f28df05dba 100644 --- a/libavcodec/x86/huffyuvencdsp_mmx.c +++ b/libavcodec/x86/huffyuvencdsp_mmx.c @@ -29,33 +29,10 @@ #include "libavcodec/huffyuvencdsp.h" #include "libavcodec/mathops.h" -#if HAVE_INLINE_ASM - -static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, - intptr_t w) -{ - x86_reg i = 0; - - if (w >= 16) - __asm__ volatile ( - "1: \n\t" - "movq (%2, %0), %%mm0 \n\t" - "movq (%1, %0), %%mm1 \n\t" - "psubb %%mm0, %%mm1 \n\t" - "movq %%mm1, (%3, %0) \n\t" - "movq 8(%2, %0), %%mm0 \n\t" - "movq 8(%1, %0), %%mm1 \n\t" - "psubb %%mm0, %%mm1 \n\t" - "movq %%mm1, 8(%3, %0) \n\t" - "add $16, %0 \n\t" - "cmp %4, %0 \n\t" - " jb 1b \n\t" - : "+r" (i) - : "r" (src1), "r" (src2), "r" (dst), "r" ((x86_reg) w - 15)); +void ff_diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, + intptr_t w); - for (; i < w; i++) - dst[i + 0] = src1[i + 0] - src2[i + 0]; -} +#if HAVE_INLINE_ASM static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, intptr_t w, @@ -101,13 +78,13 @@ static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1, av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c) { -#if HAVE_INLINE_ASM - int cpu_flags = av_get_cpu_flags(); + av_unused int cpu_flags = av_get_cpu_flags(); - if (INLINE_MMX(cpu_flags)) { - c->diff_bytes = diff_bytes_mmx; + if (EXTERNAL_MMX(cpu_flags)) { + c->diff_bytes = ff_diff_bytes_mmx; } +#if HAVE_INLINE_ASM if (INLINE_MMXEXT(cpu_flags)) { c->sub_hfyu_median_pred = sub_hfyu_median_pred_mmxext; } -- cgit v1.2.3