diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-13 13:11:38 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-24 02:23:16 +0200 |
| commit | d211547dddf9deeb34b7dda9cd80b86f3f5cd07a (patch) | |
| tree | f9295bda1276cba5bff5221556211d91fa8c5547 /libavcodec/x86/mpegvideo_mmx.c | |
| parent | 26ce9aec03d925b1ff4beaea462252ad1d7d2c61 (diff) | |
| download | ffmpeg-d211547dddf9deeb34b7dda9cd80b86f3f5cd07a.tar.gz | |
x86: mpegvideoenc: Split optimizations off into a separate file
Diffstat (limited to 'libavcodec/x86/mpegvideo_mmx.c')
| -rw-r--r-- | libavcodec/x86/mpegvideo_mmx.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/libavcodec/x86/mpegvideo_mmx.c b/libavcodec/x86/mpegvideo_mmx.c index 46ed30a76d..720deb39b8 100644 --- a/libavcodec/x86/mpegvideo_mmx.c +++ b/libavcodec/x86/mpegvideo_mmx.c @@ -1,7 +1,4 @@ /* - * The simplest mpeg encoder (well, it was the simplest!) - * Copyright (c) 2000,2001 Fabrice Bellard - * * Optimized for ia32 CPUs by Nick Kurshev <nickols_k@mail.ru> * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> * @@ -31,9 +28,6 @@ #if HAVE_INLINE_ASM -extern uint16_t ff_inv_zigzag_direct16[64]; - - static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, DCTELEM *block, int n, int qscale) { @@ -588,46 +582,6 @@ static void denoise_dct_sse2(MpegEncContext *s, DCTELEM *block){ ); } -#if HAVE_SSSE3 -#define HAVE_SSSE3_BAK -#endif -#undef HAVE_SSSE3 -#define HAVE_SSSE3 0 - -#undef HAVE_SSE2 -#undef HAVE_MMXEXT -#define HAVE_SSE2 0 -#define HAVE_MMXEXT 0 -#define RENAME(a) a ## _MMX -#define RENAMEl(a) a ## _mmx -#include "mpegvideo_mmx_template.c" - -#undef HAVE_MMXEXT -#define HAVE_MMXEXT 1 -#undef RENAME -#undef RENAMEl -#define RENAME(a) a ## _MMX2 -#define RENAMEl(a) a ## _mmx2 -#include "mpegvideo_mmx_template.c" - -#undef HAVE_SSE2 -#define HAVE_SSE2 1 -#undef RENAME -#undef RENAMEl -#define RENAME(a) a ## _SSE2 -#define RENAMEl(a) a ## _sse2 -#include "mpegvideo_mmx_template.c" - -#ifdef HAVE_SSSE3_BAK -#undef HAVE_SSSE3 -#define HAVE_SSSE3 1 -#undef RENAME -#undef RENAMEl -#define RENAME(a) a ## _SSSE3 -#define RENAMEl(a) a ## _sse2 -#include "mpegvideo_mmx_template.c" -#endif - #endif /* HAVE_INLINE_ASM */ void ff_MPV_common_init_mmx(MpegEncContext *s) @@ -636,8 +590,6 @@ void ff_MPV_common_init_mmx(MpegEncContext *s) int mm_flags = av_get_cpu_flags(); if (mm_flags & AV_CPU_FLAG_MMX) { - const int dct_algo = s->avctx->dct_algo; - s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx; s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx; @@ -651,21 +603,6 @@ void ff_MPV_common_init_mmx(MpegEncContext *s) } else { s->denoise_dct= denoise_dct_mmx; } - - if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ -#if HAVE_SSSE3 - if(mm_flags & AV_CPU_FLAG_SSSE3){ - s->dct_quantize= dct_quantize_SSSE3; - } else -#endif - if(mm_flags & AV_CPU_FLAG_SSE2){ - s->dct_quantize= dct_quantize_SSE2; - } else if (mm_flags & AV_CPU_FLAG_MMXEXT) { - s->dct_quantize= dct_quantize_MMX2; - } else { - s->dct_quantize= dct_quantize_MMX; - } - } } #endif /* HAVE_INLINE_ASM */ } |