diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 18:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:11:26 +0200 |
| commit | 6bef3e55bdc743ea81694c90f443ac2a089ddabc (patch) | |
| tree | 9d45b500d6f0bdb0cb7b15020acb1e5cc510208e /libavcodec/x86/huffyuvdsp_init.c | |
| parent | d3e51b4118585fbd4c314931bdf97502aeeee6d4 (diff) | |
| parent | 009331303a6462d07cbe94aef9c446f1a1695519 (diff) | |
| download | ffmpeg-6bef3e55bdc743ea81694c90f443ac2a089ddabc.tar.gz | |
Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'
* commit '009331303a6462d07cbe94aef9c446f1a1695519':
x86: huffyuvdsp: Move inline assembly to init file
Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/huffyuvdsp.h
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvdsp_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/huffyuvdsp_init.c')
| -rw-r--r-- | libavcodec/x86/huffyuvdsp_init.c | 47 |
1 files changed, 43 insertions, 4 deletions
diff --git a/libavcodec/x86/huffyuvdsp_init.c b/libavcodec/x86/huffyuvdsp_init.c index 58a88e8492..3ced3c0a1c 100644 --- a/libavcodec/x86/huffyuvdsp_init.c +++ b/libavcodec/x86/huffyuvdsp_init.c @@ -1,4 +1,6 @@ /* + * Copyright (c) 2009 Loren Merritt <lorenm@u.washington.edu> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -22,7 +24,6 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/huffyuvdsp.h" -#include "huffyuvdsp.h" void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, intptr_t w); void ff_add_bytes_sse2(uint8_t *dst, uint8_t *src, intptr_t w); @@ -44,13 +45,51 @@ void ff_add_hfyu_left_pred_bgr32_mmx(uint8_t *dst, const uint8_t *src, void ff_add_hfyu_left_pred_bgr32_sse2(uint8_t *dst, const uint8_t *src, intptr_t w, uint8_t *left); +#if HAVE_INLINE_ASM && HAVE_7REGS && ARCH_X86_32 +static void add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top, + const uint8_t *diff, intptr_t w, + int *left, int *left_top) +{ + x86_reg w2 = -w; + x86_reg x; + int l = *left & 0xff; + int tl = *left_top & 0xff; + int t; + __asm__ volatile ( + "mov %7, %3 \n" + "1: \n" + "movzbl (%3, %4), %2 \n" + "mov %2, %k3 \n" + "sub %b1, %b3 \n" + "add %b0, %b3 \n" + "mov %2, %1 \n" + "cmp %0, %2 \n" + "cmovg %0, %2 \n" + "cmovg %1, %0 \n" + "cmp %k3, %0 \n" + "cmovg %k3, %0 \n" + "mov %7, %3 \n" + "cmp %2, %0 \n" + "cmovl %2, %0 \n" + "add (%6, %4), %b0 \n" + "mov %b0, (%5, %4) \n" + "inc %4 \n" + "jl 1b \n" + : "+&q"(l), "+&q"(tl), "=&r"(t), "=&q"(x), "+&r"(w2) + : "r"(dst + w), "r"(diff + w), "rm"(top + w) + ); + *left = l; + *left_top = tl; +} +#endif + av_cold void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c) { int cpu_flags = av_get_cpu_flags(); -#if HAVE_7REGS && HAVE_INLINE_ASM - if (ARCH_X86_32 && cpu_flags & AV_CPU_FLAG_CMOV) - c->add_hfyu_median_pred = ff_add_hfyu_median_pred_cmov; +#if HAVE_INLINE_ASM && HAVE_7REGS && ARCH_X86_32 + if (cpu_flags & AV_CPU_FLAG_CMOV) + c->add_hfyu_median_pred = add_hfyu_median_pred_cmov; #endif if (ARCH_X86_32 && EXTERNAL_MMX(cpu_flags)) { |