diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:41:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:41:19 +0100 |
commit | fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769 (patch) | |
tree | 1752b2b23e6f7058133bf844b6c783153350613f /libavcodec/arm/dca.h | |
parent | ffb7d7195be6a4f25e81600a2a6a6dadd2a11e18 (diff) | |
parent | 4cb6964244fd6c099383d8b7e99731e72cc844b9 (diff) |
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
dcadec: simplify decoding of VQ high frequencies
Conflicts:
configure
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dca.h')
-rw-r--r-- | libavcodec/arm/dca.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 93393fcf92..6e87111a32 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -79,27 +79,4 @@ static inline int decode_blockcodes(int code1, int code2, int levels, #endif -#if HAVE_NEON_INLINE && HAVE_ASM_MOD_Y - -#define int8x8_fmul_int32 int8x8_fmul_int32 -static inline void int8x8_fmul_int32(av_unused DCADSPContext *dsp, - float *dst, const int8_t *src, int scale) -{ - __asm__ ("vcvt.f32.s32 %2, %2, #4 \n" - "vld1.8 {d0}, [%1,:64] \n" - "vmovl.s8 q0, d0 \n" - "vmovl.s16 q1, d1 \n" - "vmovl.s16 q0, d0 \n" - "vcvt.f32.s32 q0, q0 \n" - "vcvt.f32.s32 q1, q1 \n" - "vmul.f32 q0, q0, %y2 \n" - "vmul.f32 q1, q1, %y2 \n" - "vst1.32 {q0-q1}, [%m0,:128] \n" - : "=Um"(*(float (*)[8])dst) - : "r"(src), "x"(scale) - : "d0", "d1", "d2", "d3"); -} - -#endif - #endif /* AVCODEC_ARM_DCA_H */ |