diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-02-03 10:09:45 -0800 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-07-07 12:28:45 -0700 |
commit | a9aee08d900f686e966c64afec5d88a7d9d130a3 (patch) | |
tree | 92335216bc97235507f805401693ed534a8f5fc9 /libavcodec/x86 | |
parent | 1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d (diff) | |
download | ffmpeg-streaming-a9aee08d900f686e966c64afec5d88a7d9d130a3.zip ffmpeg-streaming-a9aee08d900f686e966c64afec5d88a7d9d130a3.tar.gz |
dsputil: Split off FDCT bits into their own context
Diffstat (limited to 'libavcodec/x86')
-rw-r--r-- | libavcodec/x86/Makefile | 3 | ||||
-rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 14 | ||||
-rw-r--r-- | libavcodec/x86/fdctdsp_init.c | 44 |
3 files changed, 46 insertions, 15 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 58b27b5..afb26d0 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -9,6 +9,7 @@ OBJS-$(CONFIG_DCT) += x86/dct_init.o OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ x86/motion_est.o +OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_H263DSP) += x86/h263dsp_init.o OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o @@ -51,9 +52,9 @@ OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o MMX-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_mmx.o -MMX-OBJS-$(CONFIG_ENCODERS) += x86/fdct.o MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \ x86/hpeldsp_mmx.o +MMX-OBJS-$(CONFIG_FDCTDSP) += x86/fdct.o MMX-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_mmx.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 563543e..fb649e4 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -26,7 +26,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dct.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "dsputil_x86.h" @@ -823,7 +822,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { int cpu_flags = av_get_cpu_flags(); - const int dct_algo = avctx->dct_algo; if (EXTERNAL_MMX(cpu_flags)) { if (!high_bit_depth) @@ -837,10 +835,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, #if HAVE_INLINE_ASM if (INLINE_MMX(cpu_flags)) { - if (!high_bit_depth && - (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) - c->fdct = ff_fdct_mmx; - c->sum_abs_dctelem = sum_abs_dctelem_mmx; c->sse[0] = sse16_mmx; @@ -855,10 +849,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, } if (INLINE_MMXEXT(cpu_flags)) { - if (!high_bit_depth && - (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) - c->fdct = ff_fdct_mmxext; - c->sum_abs_dctelem = sum_abs_dctelem_mmxext; c->vsad[4] = vsad_intra16_mmxext; @@ -868,10 +858,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, } if (INLINE_SSE2(cpu_flags)) { - if (!high_bit_depth && - (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) - c->fdct = ff_fdct_sse2; - c->sum_abs_dctelem = sum_abs_dctelem_sse2; } diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c new file mode 100644 index 0000000..93fdd65 --- /dev/null +++ b/libavcodec/x86/fdctdsp_init.c @@ -0,0 +1,44 @@ +/* + * 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 "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/dct.h" +#include "libavcodec/fdctdsp.h" + +av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth) +{ + int cpu_flags = av_get_cpu_flags(); + const int dct_algo = avctx->dct_algo; + + if (!high_bit_depth) { + if ((dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) { + if (INLINE_MMX(cpu_flags)) + c->fdct = ff_fdct_mmx; + + if (INLINE_MMXEXT(cpu_flags)) + c->fdct = ff_fdct_mmxext; + + if (INLINE_SSE2(cpu_flags)) + c->fdct = ff_fdct_sse2; + } + } +} |