diff options
author | Mans Rullgard <mans@mansr.com> | 2012-09-10 15:47:00 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-24 23:16:14 +0200 |
commit | 5dc73634469dc54e109fe0fd9f3fc0c24409e548 (patch) | |
tree | c86420f7d09ae12d6fed70157604bfc1328b7910 /libswresample/arm/audio_convert_init.c | |
parent | 0eebde07a99f14cf5f96bd64e705db45b6de6364 (diff) |
ARM: libswresample: NEON optimised stereo fltp to s16 conversion
Adaption to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm/audio_convert_init.c')
-rw-r--r-- | libswresample/arm/audio_convert_init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libswresample/arm/audio_convert_init.c b/libswresample/arm/audio_convert_init.c index f8f80078a7..a52ea5a196 100644 --- a/libswresample/arm/audio_convert_init.c +++ b/libswresample/arm/audio_convert_init.c @@ -27,11 +27,17 @@ #include "libswresample/audioconvert.h" void swri_oldapi_conv_flt_to_s16_neon(int16_t *dst, const float *src, int len); +void swri_oldapi_conv_fltp_to_s16_2ch_neon(int16_t *dst, float *const *src, int len, int channels); static void conv_flt_to_s16_neon(uint8_t **dst, const uint8_t **src, int len){ swri_oldapi_conv_flt_to_s16_neon((int16_t*)*dst, (const float*)*src, len); } +static void conv_fltp_to_s16_2ch_neon(uint8_t **dst, const uint8_t **src, int len){ + swri_oldapi_conv_fltp_to_s16_2ch_neon((int16_t*)*dst, (float *const*)src, len, 2); +} + + av_cold void swri_audio_convert_init_arm(struct AudioConvert *ac, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt, @@ -44,5 +50,7 @@ av_cold void swri_audio_convert_init_arm(struct AudioConvert *ac, if (have_neon(cpu_flags)) { if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLT || out_fmt == AV_SAMPLE_FMT_S16P && in_fmt == AV_SAMPLE_FMT_FLTP) ac->simd_f = conv_flt_to_s16_neon; + if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels == 2) + ac->simd_f = conv_fltp_to_s16_2ch_neon; } } |