diff options
| author | Martin Storsjö <martin@martin.st> | 2013-07-19 11:03:32 +0300 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2013-08-02 14:22:45 +0100 |
| commit | 9a67858de12b33ffcb8fcc3c330417699e7aa037 (patch) | |
| tree | 39d7228221963db7700bbfb9254c9e60a47560ac | |
| parent | 6496daa940fafe2b7cad9be8ad08480de2bf97a8 (diff) | |
[ffmpeg] - backport - arm: Add VFP-accelerated version of dca_lfe_fir
Before After
Mean StdDev Mean StdDev Change
This function 868.2 33.5 436.0 27.0 +99.1%
Overall 15973.0 223.2 15577.5 83.2 +2.5%
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | lib/ffmpeg/libavcodec/arm/Makefile | 3 | ||||
| -rw-r--r-- | lib/ffmpeg/libavcodec/arm/dcadsp_init_arm.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavcodec/arm/Makefile b/lib/ffmpeg/libavcodec/arm/Makefile index 27e80d5bf4..7fe5bb56ae 100644 --- a/lib/ffmpeg/libavcodec/arm/Makefile +++ b/lib/ffmpeg/libavcodec/arm/Makefile @@ -58,7 +58,8 @@ ARMV6-OBJS += arm/dsputil_init_armv6.o \ arm/dsputil_armv6.o \ arm/simple_idct_armv6.o \ -VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/synth_filter_vfp.o +VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \ + arm/synth_filter_vfp.o VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o diff --git a/lib/ffmpeg/libavcodec/arm/dcadsp_init_arm.c b/lib/ffmpeg/libavcodec/arm/dcadsp_init_arm.c index 56568e0038..a1efbfff7f 100644 --- a/lib/ffmpeg/libavcodec/arm/dcadsp_init_arm.c +++ b/lib/ffmpeg/libavcodec/arm/dcadsp_init_arm.c @@ -24,6 +24,8 @@ #include "libavutil/attributes.h" #include "libavcodec/dcadsp.h" +void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs, + int decifactor, float scale); void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, int decifactor, float scale); @@ -31,6 +33,8 @@ 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)) + s->lfe_fir = ff_dca_lfe_fir_vfp; if (have_neon(cpu_flags)) s->lfe_fir = ff_dca_lfe_fir_neon; } |