diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-08 02:59:58 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-17 09:07:10 -0700 |
| commit | 2d60444331fca1910510038dd3817bea885c2367 (patch) | |
| tree | 51ac937c7e051b03c7cc8e39b079a37f18dd09b0 /libavcodec/x86 | |
| parent | a578b0407dc983aecd72028e1127062689b67089 (diff) | |
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/x86/me_cmp.asm (renamed from libavcodec/x86/dsputilenc.asm) | 2 | ||||
| -rw-r--r-- | libavcodec/x86/me_cmp_init.c (renamed from libavcodec/x86/dsputil_init.c) | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index c8804bb37c..3e9b41c890 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,7 +6,6 @@ OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_init.o OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp.o OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp_init.o OBJS-$(CONFIG_DCT) += x86/dct_init.o -OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_H263DSP) += x86/h263dsp_init.o @@ -19,6 +18,7 @@ OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp_init.o OBJS-$(CONFIG_HUFFYUVENCDSP) += x86/huffyuvencdsp_mmx.o OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_init.o OBJS-$(CONFIG_LPC) += x86/lpc.o +OBJS-$(CONFIG_ME_CMP) += x86/me_cmp_init.o OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o \ x86/mpegvideodsp.o @@ -70,7 +70,6 @@ YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o -YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ @@ -90,6 +89,7 @@ YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_8bit.o \ YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \ x86/hpeldsp.o YASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o +YASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o YASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o YASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/me_cmp.asm index 8d989c26f8..1a87f37b39 100644 --- a/libavcodec/x86/dsputilenc.asm +++ b/libavcodec/x86/me_cmp.asm @@ -1,5 +1,5 @@ ;***************************************************************************** -;* MMX optimized DSP utils +;* SIMD-optimized motion compensation estimation ;***************************************************************************** ;* Copyright (c) 2000, 2001 Fabrice Bellard ;* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/me_cmp_init.c index 1303757dd2..e93b67b053 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/me_cmp_init.c @@ -1,5 +1,5 @@ /* - * MMX optimized DSP utils + * SIMD-optimized motion estimation * Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * @@ -26,7 +26,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/me_cmp.h" #include "libavcodec/mpegvideo.h" #if HAVE_INLINE_ASM @@ -411,7 +411,7 @@ static int nsse16_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2, int score1, score2; if (c) - score1 = c->dsp.sse[0](c, pix1, pix2, line_size, h); + score1 = c->mecc.sse[0](c, pix1, pix2, line_size, h); else score1 = sse16_mmx(c, pix1, pix2, line_size, h); score2 = hf_noise16_mmx(pix1, line_size, h) - @@ -1225,7 +1225,7 @@ hadamard_func(mmxext) hadamard_func(sse2) hadamard_func(ssse3) -av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) +av_cold void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); |