diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-05-02 15:36:43 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-23 20:10:56 -0400 |
| commit | 13df7d2d40237152a00a98a40c8e844a026ee5fa (patch) | |
| tree | ca6ba3caf1752ce486bcc5116df8e7429ae46692 /libavresample/x86/audio_convert_init.c | |
| parent | c0e12535aa10213f9cb4dce2ea1b63acbf679bb5 (diff) | |
| download | ffmpeg-13df7d2d40237152a00a98a40c8e844a026ee5fa.tar.gz | |
lavr: x86: optimized 6-channel s16p to s16 conversion
Diffstat (limited to 'libavresample/x86/audio_convert_init.c')
| -rw-r--r-- | libavresample/x86/audio_convert_init.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavresample/x86/audio_convert_init.c b/libavresample/x86/audio_convert_init.c index 9b7bcb15e1..d9d471487d 100644 --- a/libavresample/x86/audio_convert_init.c +++ b/libavresample/x86/audio_convert_init.c @@ -47,6 +47,13 @@ extern void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src, extern void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src, int len, int channels); +extern void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src, + int len, int channels); +extern void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src, + int len, int channels); +extern void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src, + int len, int channels); + extern void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len, int channels); extern void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len, @@ -69,6 +76,11 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac) if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) { ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, 0, 16, 16, "SSE2", ff_conv_s32_to_s16_sse2); + ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + 6, 16, 8, "SSE2", ff_conv_s16p_to_s16_6ch_sse2); + } else { + ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + 6, 1, 4, "SSE2SLOW", ff_conv_s16p_to_s16_6ch_sse2slow); } ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S16, 0, 16, 8, "SSE2", ff_conv_s16_to_s32_sse2); @@ -96,6 +108,8 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac) 0, 32, 32, "AVX", ff_conv_flt_to_s32_avx); ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, 2, 16, 16, "AVX", ff_conv_s16p_to_s16_2ch_avx); + ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + 6, 16, 8, "AVX", ff_conv_s16p_to_s16_6ch_avx); ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, 6, 16, 4, "AVX", ff_conv_fltp_to_flt_6ch_avx); } |