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:19:32 +0200 |
| commit | 7e3208a0876bcbce41549f475882c653f2cbc007 (patch) | |
| tree | ff2a05e966a0098f3e3678c458a55d3bd3a05fc8 /libswresample/arm/audio_convert_init.c | |
| parent | 97599f8c6d078868be30c18516899325d3c053c2 (diff) | |
| download | ffmpeg-7e3208a0876bcbce41549f475882c653f2cbc007.tar.gz | |
ARM: libswresample: NEON optimised generic fltp to s16 conversion
Adapted 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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libswresample/arm/audio_convert_init.c b/libswresample/arm/audio_convert_init.c index a52ea5a196..9fdb174608 100644 --- a/libswresample/arm/audio_convert_init.c +++ b/libswresample/arm/audio_convert_init.c @@ -28,6 +28,7 @@ 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); +void swri_oldapi_conv_fltp_to_s16_nch_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); @@ -37,6 +38,12 @@ static void conv_fltp_to_s16_2ch_neon(uint8_t **dst, const uint8_t **src, int le swri_oldapi_conv_fltp_to_s16_2ch_neon((int16_t*)*dst, (float *const*)src, len, 2); } +static void conv_fltp_to_s16_nch_neon(uint8_t **dst, const uint8_t **src, int len){ + int channels; + for(channels=3; channels<SWR_CH_MAX && src[channels]; channels++) + ; + swri_oldapi_conv_fltp_to_s16_nch_neon((int16_t*)*dst, (float *const*)src, len, channels); +} av_cold void swri_audio_convert_init_arm(struct AudioConvert *ac, enum AVSampleFormat out_fmt, @@ -52,5 +59,7 @@ av_cold void swri_audio_convert_init_arm(struct AudioConvert *ac, 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; + if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels > 2) + ac->simd_f = conv_fltp_to_s16_nch_neon; } } |