diff options
author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-05-30 16:28:49 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-05 20:31:59 +0200 |
commit | ccff45a0d3c981edc97078885e2a630e0436ce31 (patch) | |
tree | 978070bbff082597623c0c954e9890b6839e794d /libavcodec/x86/apedsp_init.c | |
parent | 151f88d507f18c0aae011f9e88f40c508c11640f (diff) |
apedsp: move to llauddsp
APE is not the sole codec using scalarproduct_and_madd_int16.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/apedsp_init.c')
-rw-r--r-- | libavcodec/x86/apedsp_init.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/libavcodec/x86/apedsp_init.c b/libavcodec/x86/apedsp_init.c deleted file mode 100644 index 2e90b2d04c..0000000000 --- a/libavcodec/x86/apedsp_init.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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/x86/cpu.h" -#include "libavcodec/apedsp.h" - -int32_t ff_scalarproduct_and_madd_int16_mmxext(int16_t *v1, const int16_t *v2, - const int16_t *v3, - int order, int mul); -int32_t ff_scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2, - const int16_t *v3, - int order, int mul); -int32_t ff_scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2, - const int16_t *v3, - int order, int mul); - -av_cold void ff_apedsp_init_x86(APEDSPContext *c) -{ - int cpu_flags = av_get_cpu_flags(); - - if (EXTERNAL_MMXEXT(cpu_flags)) - c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext; - - if (EXTERNAL_SSE2(cpu_flags)) - c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2; - - if (EXTERNAL_SSSE3(cpu_flags) && - !(cpu_flags & (AV_CPU_FLAG_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit - c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_ssse3; -} |