From 2ddb35b91131115c094d90e04031451023441b4d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 5 Oct 2013 18:38:06 +0200 Subject: [PATCH] x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx The function does not depend on MMX and compilation without MMX enabled fails if the function is compiled conditional on MMX availability. --- libavcodec/x86/Makefile | 3 +- libavcodec/x86/dsputil_mmx.c | 38 --------------------- libavcodec/x86/dsputil_x86.c | 65 ++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 39 deletions(-) create mode 100644 libavcodec/x86/dsputil_x86.c diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 684b4ee667..ea6628cb61 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,7 +6,8 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DCT) += x86/dct_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o -OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o +OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o \ + x86/dsputil_x86.o OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ x86/fdct.o \ x86/motion_est.o diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index b0e48e3117..885c10a70f 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -249,44 +249,6 @@ void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, int w) dst[i + 0] += src[i + 0]; } -#if HAVE_7REGS -void ff_add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top, - const uint8_t *diff, int 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 - /* Draw the edges of width 'w' of an image of size width, height * this MMX version can only handle w == 8 || w == 16. */ void ff_draw_edges_mmx(uint8_t *buf, int wrap, int width, int height, diff --git a/libavcodec/x86/dsputil_x86.c b/libavcodec/x86/dsputil_x86.c new file mode 100644 index 0000000000..144339be64 --- /dev/null +++ b/libavcodec/x86/dsputil_x86.c @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2009 Loren Merritt + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libavutil/x86/asm.h" +#include "dsputil_x86.h" + +#if HAVE_INLINE_ASM + +#if HAVE_7REGS +void ff_add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top, + const uint8_t *diff, int 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 + +#endif /* HAVE_INLINE_ASM */