diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:00:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:00:45 +0200 |
| commit | 99e7c702db5c42a79aaa48c502fec3e15d8cf308 (patch) | |
| tree | f67ba9c0b47189d7821f42890e67398d20282150 /libavcodec/arm | |
| parent | 01cac26f6848a809aba3f08e45d8c339702d90a9 (diff) | |
| parent | bd549cbaacd33dfb7be81d0619c9b107b8a85be7 (diff) | |
| download | android_external_ffmpeg-99e7c702db5c42a79aaa48c502fec3e15d8cf308.tar.gz android_external_ffmpeg-99e7c702db5c42a79aaa48c502fec3e15d8cf308.tar.bz2 android_external_ffmpeg-99e7c702db5c42a79aaa48c502fec3e15d8cf308.zip | |
Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'
* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
arm: dcadsp: Move synth filter initialization to dcadsp file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 22 | ||||
| -rw-r--r-- | libavcodec/arm/fft_init_arm.c | 24 |
2 files changed, 22 insertions, 24 deletions
diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index 58267a2fe6..8893f48368 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -35,6 +35,18 @@ void ff_dca_qmf_32_subbands_vfp(float samples_in[32][8], int sb_act, void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, int decifactor, float scale); +void ff_synth_filter_float_vfp(FFTContext *imdct, + float *synth_buf_ptr, int *synth_buf_offset, + float synth_buf2[32], const float window[512], + float out[32], const float in[32], + float scale); + +void ff_synth_filter_float_neon(FFTContext *imdct, + float *synth_buf_ptr, int *synth_buf_offset, + float synth_buf2[32], const float window[512], + float out[32], const float in[32], + float scale); + av_cold void ff_dcadsp_init_arm(DCADSPContext *s) { int cpu_flags = av_get_cpu_flags(); @@ -46,3 +58,13 @@ av_cold void ff_dcadsp_init_arm(DCADSPContext *s) if (have_neon(cpu_flags)) s->lfe_fir = ff_dca_lfe_fir_neon; } + +av_cold void ff_synth_filter_init_arm(SynthFilterContext *s) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) + s->synth_filter_float = ff_synth_filter_float_vfp; + if (have_neon(cpu_flags)) + s->synth_filter_float = ff_synth_filter_float_neon; +} diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c index a000ea54e8..7e49b9c09c 100644 --- a/libavcodec/arm/fft_init_arm.c +++ b/libavcodec/arm/fft_init_arm.c @@ -34,18 +34,6 @@ void ff_mdct_calc_neon(FFTContext *s, FFTSample *output, const FFTSample *input) void ff_rdft_calc_neon(struct RDFTContext *s, FFTSample *z); -void ff_synth_filter_float_vfp(FFTContext *imdct, - float *synth_buf_ptr, int *synth_buf_offset, - float synth_buf2[32], const float window[512], - float out[32], const float in[32], - float scale); - -void ff_synth_filter_float_neon(FFTContext *imdct, - float *synth_buf_ptr, int *synth_buf_offset, - float synth_buf2[32], const float window[512], - float out[32], const float in[32], - float scale); - av_cold void ff_fft_init_arm(FFTContext *s) { int cpu_flags = av_get_cpu_flags(); @@ -80,15 +68,3 @@ av_cold void ff_rdft_init_arm(RDFTContext *s) s->rdft_calc = ff_rdft_calc_neon; } #endif - -#if CONFIG_DCA_DECODER -av_cold void ff_synth_filter_init_arm(SynthFilterContext *s) -{ - int cpu_flags = av_get_cpu_flags(); - - if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) - s->synth_filter_float = ff_synth_filter_float_vfp; - if (have_neon(cpu_flags)) - s->synth_filter_float = ff_synth_filter_float_neon; -} -#endif |