diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-02-21 11:37:52 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-02-28 21:51:24 +0100 |
commit | d74a8cb7e42f703be5796eeb485f06af710ae8ca (patch) | |
tree | f07e3022ce42e14039666e7efdbfe9a93c3441da /libavcodec/x86/fmtconvert_init.c | |
parent | ee964145b5d229571e00bf6883a44189d02babe2 (diff) | |
download | ffmpeg-d74a8cb7e42f703be5796eeb485f06af710ae8ca.tar.gz |
fmtconvert: drop unused functions
Diffstat (limited to 'libavcodec/x86/fmtconvert_init.c')
-rw-r--r-- | libavcodec/x86/fmtconvert_init.c | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index 3d75df92bd..1871b477bb 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -33,84 +33,6 @@ void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float mul, int len); void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len); -void ff_float_to_int16_3dnow(int16_t *dst, const float *src, long len); -void ff_float_to_int16_sse (int16_t *dst, const float *src, long len); -void ff_float_to_int16_sse2 (int16_t *dst, const float *src, long len); - -void ff_float_to_int16_step_3dnow(int16_t *dst, const float *src, long len, long step); -void ff_float_to_int16_step_sse (int16_t *dst, const float *src, long len, long step); -void ff_float_to_int16_step_sse2 (int16_t *dst, const float *src, long len, long step); - -void ff_float_to_int16_interleave2_3dnow(int16_t *dst, const float **src, long len); -void ff_float_to_int16_interleave2_sse (int16_t *dst, const float **src, long len); -void ff_float_to_int16_interleave2_sse2 (int16_t *dst, const float **src, long len); - -void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len); -void ff_float_to_int16_interleave6_3dnow(int16_t *dst, const float **src, int len); -void ff_float_to_int16_interleave6_3dnowext(int16_t *dst, const float **src, int len); - -#define ff_float_to_int16_interleave6_sse2 ff_float_to_int16_interleave6_sse - -#define FLOAT_TO_INT16_INTERLEAVE(cpu) \ -/* gcc pessimizes register allocation if this is in the same function as float_to_int16_interleave_sse2*/\ -static av_noinline void float_to_int16_interleave_misc_##cpu(int16_t *dst, const float **src, long len, int channels){\ - int c;\ - for(c=0; c<channels; c++){\ - ff_float_to_int16_step_##cpu(dst+c, src[c], len, channels);\ - }\ -}\ -\ -static void float_to_int16_interleave_##cpu(int16_t *dst, const float **src, long len, int channels){\ - if(channels==1)\ - ff_float_to_int16_##cpu(dst, src[0], len);\ - else if(channels==2){\ - ff_float_to_int16_interleave2_##cpu(dst, src, len);\ - }else if(channels==6){\ - ff_float_to_int16_interleave6_##cpu(dst, src, len);\ - }else\ - float_to_int16_interleave_misc_##cpu(dst, src, len, channels);\ -} - -FLOAT_TO_INT16_INTERLEAVE(3dnow) -FLOAT_TO_INT16_INTERLEAVE(sse) -FLOAT_TO_INT16_INTERLEAVE(sse2) - -static void float_to_int16_interleave_3dnowext(int16_t *dst, const float **src, - long len, int channels) -{ - if(channels==6) - ff_float_to_int16_interleave6_3dnowext(dst, src, len); - else - float_to_int16_interleave_3dnow(dst, src, len, channels); -} - -void ff_float_interleave2_mmx(float *dst, const float **src, unsigned int len); -void ff_float_interleave2_sse(float *dst, const float **src, unsigned int len); - -void ff_float_interleave6_mmx(float *dst, const float **src, unsigned int len); -void ff_float_interleave6_sse(float *dst, const float **src, unsigned int len); - -static void float_interleave_mmx(float *dst, const float **src, - unsigned int len, int channels) -{ - if (channels == 2) { - ff_float_interleave2_mmx(dst, src, len); - } else if (channels == 6) - ff_float_interleave6_mmx(dst, src, len); - else - ff_float_interleave_c(dst, src, len, channels); -} - -static void float_interleave_sse(float *dst, const float **src, - unsigned int len, int channels) -{ - if (channels == 2) { - ff_float_interleave2_sse(dst, src, len); - } else if (channels == 6) - ff_float_interleave6_sse(dst, src, len); - else - ff_float_interleave_c(dst, src, len, channels); -} #endif /* HAVE_YASM */ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) @@ -118,30 +40,11 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx #if HAVE_YASM int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_MMX(cpu_flags)) { - c->float_interleave = float_interleave_mmx; - } - if (EXTERNAL_AMD3DNOW(cpu_flags)) { - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16 = ff_float_to_int16_3dnow; - c->float_to_int16_interleave = float_to_int16_interleave_3dnow; - } - } - if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) { - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16_interleave = float_to_int16_interleave_3dnowext; - } - } if (EXTERNAL_SSE(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse; - c->float_to_int16 = ff_float_to_int16_sse; - c->float_to_int16_interleave = float_to_int16_interleave_sse; - c->float_interleave = float_interleave_sse; } if (EXTERNAL_SSE2(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2; - c->float_to_int16 = ff_float_to_int16_sse2; - c->float_to_int16_interleave = float_to_int16_interleave_sse2; } #endif /* HAVE_YASM */ } |