diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 12:11:18 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 12:11:23 +0200 |
commit | 23f250d2bc5340d6e93659d9f91ae8aa3fcf518b (patch) | |
tree | 595f34bc3a12a26d41134b570b22a8cf87e83cb1 /libavcodec/arm/dcadsp_init_arm.c | |
parent | 366e415836c52cce71b2f0d11fd04eea0a590c97 (diff) | |
parent | ff30d121595e21f2fe07fbe31afefad0c719b5d7 (diff) | |
download | ffmpeg-23f250d2bc5340d6e93659d9f91ae8aa3fcf518b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add VFP-accelerated version of qmf_32_subbands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dcadsp_init_arm.c')
-rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index a1efbfff7f..58267a2fe6 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -26,6 +26,12 @@ void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs, int decifactor, float scale); +void ff_dca_qmf_32_subbands_vfp(float samples_in[32][8], int sb_act, + SynthFilterContext *synth, FFTContext *imdct, + float synth_buf_ptr[512], + int *synth_buf_offset, float synth_buf2[32], + const float window[512], float *samples_out, + float raXin[32], float scale); void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, int decifactor, float scale); @@ -33,8 +39,10 @@ av_cold void ff_dcadsp_init_arm(DCADSPContext *s) { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) + if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) { s->lfe_fir = ff_dca_lfe_fir_vfp; + s->qmf_32_subbands = ff_dca_qmf_32_subbands_vfp; + } if (have_neon(cpu_flags)) s->lfe_fir = ff_dca_lfe_fir_neon; } |