diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:07:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:13:16 +0100 |
commit | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (patch) | |
tree | 4ed9a1feb6ea8db5b431487e6618d1015e84eb9a /libavcodec/arm/vorbisdsp_init_arm.c | |
parent | cf061a9c3b861a048dd5b67ded5265c6f53805e5 (diff) | |
parent | fef906c77c09940a2fdad155b2adc05080e17eda (diff) | |
download | ffmpeg-streaming-c62cb1112ffc32492c99aa1e94324fc6a951abe9.zip ffmpeg-streaming-c62cb1112ffc32492c99aa1e94324fc6a951abe9.tar.gz |
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vorbisdsp_init_arm.c')
-rw-r--r-- | libavcodec/arm/vorbisdsp_init_arm.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/libavcodec/arm/vorbisdsp_init_arm.c b/libavcodec/arm/vorbisdsp_init_arm.c new file mode 100644 index 0000000..8744638 --- /dev/null +++ b/libavcodec/arm/vorbisdsp_init_arm.c @@ -0,0 +1,36 @@ +/* + * ARM NEON optimised DSP functions + * Copyright (c) 2008 Mans Rullgard <mans@mansr.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/arm/cpu.h" +#include "libavcodec/vorbisdsp.h" + +void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, int blocksize); + +void ff_vorbisdsp_init_arm(VorbisDSPContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { + c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon; + } +} |