diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-29 14:10:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-29 14:20:35 +0200 |
| commit | 65722e7fc5918644ca92d5cdfcb88a54b1b64d44 (patch) | |
| tree | c975bfd5f19d5ac8ef07e7c49892747a833f6476 /libswresample/x86 | |
| parent | 755667eebc0b6303814faadef047870071ccb5c6 (diff) | |
| download | ffmpeg-65722e7fc5918644ca92d5cdfcb88a54b1b64d44.tar.gz | |
swr: int32_to_int16_mmx/sse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
| -rw-r--r-- | libswresample/x86/audio_convert.asm | 31 | ||||
| -rw-r--r-- | libswresample/x86/swresample_x86.c | 6 |
2 files changed, 36 insertions, 1 deletions
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index 1c70f6ef4c..f220e2d135 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -194,14 +194,45 @@ float_to_int16_u_int %+ SUFFIX REP_RET %endmacro +%macro INT32_TO_INT16 1 +cglobal int32_to_int16_%1, 3, 3, 2, dst, src, len + mov srcq, [srcq] + mov dstq, [dstq] +%ifidn %1, a + test dstq, mmsize-1 + jne int32_to_int16_u_int %+ SUFFIX + test srcq, mmsize-1 + jne int32_to_int16_u_int %+ SUFFIX +%else +int32_to_int16_u_int %+ SUFFIX +%endif + lea srcq, [srcq + 2*lenq] + add dstq, lenq + neg lenq +.next: + mov%1 m0, [ srcq+2*lenq] + mov%1 m1, [mmsize + srcq+2*lenq] + psrad m0, 16 + psrad m1, 16 + packssdw m0, m1 + mov%1 [ dstq+lenq], m0 + add lenq, mmsize + jl .next + REP_RET +%endmacro + INIT_MMX mmx INT16_TO_INT32 u INT16_TO_INT32 a +INT32_TO_INT16 u +INT32_TO_INT16 a INIT_XMM sse INT16_TO_INT32 u INT16_TO_INT32 a +INT32_TO_INT16 u +INT32_TO_INT16 a INIT_XMM sse2 INT32_TO_FLOAT u diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c index c1ffe43175..9e5ac493c4 100644 --- a/libswresample/x86/swresample_x86.c +++ b/libswresample/x86/swresample_x86.c @@ -22,7 +22,9 @@ #include "libswresample/audioconvert.h" #define MULTI_CAPS_FUNC_DECL(cap) \ - void ff_int16_to_int32_a_ ## cap(uint8_t **dst, const uint8_t **src, int len); + void ff_int16_to_int32_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);\ + void ff_int32_to_int16_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);\ + MULTI_CAPS_FUNC_DECL(mmx) MULTI_CAPS_FUNC_DECL(sse) @@ -45,6 +47,8 @@ void swri_audio_convert_init_x86(struct AudioConvert *ac, if (mm_flags & flag) {\ if( out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S16 || out_fmt == AV_SAMPLE_FMT_S32P && in_fmt == AV_SAMPLE_FMT_S16P)\ ac->simd_f = ff_int16_to_int32_a_ ## cap;\ + if( out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_S32 || out_fmt == AV_SAMPLE_FMT_S16P && in_fmt == AV_SAMPLE_FMT_S32P)\ + ac->simd_f = ff_int32_to_int16_a_ ## cap;\ } MULTI_CAPS_FUNC(AV_CPU_FLAG_MMX, mmx) |