diff options
| author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2015-12-18 14:54:02 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2015-12-24 13:58:18 +0100 |
| commit | 2008f76054906e9ff6bf744800af0e5a5bfe61be (patch) | |
| tree | 4981d3e41d9d5b13d904d91da6342ba74020e1b9 /libavcodec/aarch64 | |
| parent | aebf07075f4244caf591a3af71e5872fe314e87b (diff) | |
dca: remove unused decode_hf function and quant_d tables
They were superseded with their integer equivalents. Rename integer
decode_hf to decode_hf.
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/dcadsp_init.c | 7 | ||||
| -rw-r--r-- | libavcodec/aarch64/dcadsp_neon.S | 60 |
2 files changed, 0 insertions, 67 deletions
diff --git a/libavcodec/aarch64/dcadsp_init.c b/libavcodec/aarch64/dcadsp_init.c index c66ec3f538..d3430d045c 100644 --- a/libavcodec/aarch64/dcadsp_init.c +++ b/libavcodec/aarch64/dcadsp_init.c @@ -41,12 +41,6 @@ void ff_synth_filter_float_neon(FFTContext *imdct, float out[32], const float in[32], float scale); -void ff_decode_hf_neon(float dst[DCA_SUBBANDS][8], - const int32_t vq_num[DCA_SUBBANDS], - const int8_t hf_vq[1024][32], intptr_t vq_offset, - int32_t scale[DCA_SUBBANDS][2], - intptr_t start, intptr_t end); - av_cold void ff_dcadsp_init_aarch64(DCADSPContext *s) { int cpu_flags = av_get_cpu_flags(); @@ -54,7 +48,6 @@ av_cold void ff_dcadsp_init_aarch64(DCADSPContext *s) if (have_neon(cpu_flags)) { s->lfe_fir[0] = ff_dca_lfe_fir0_neon; s->lfe_fir[1] = ff_dca_lfe_fir1_neon; - s->decode_hf = ff_decode_hf_neon; } } diff --git a/libavcodec/aarch64/dcadsp_neon.S b/libavcodec/aarch64/dcadsp_neon.S index 73196d914b..4cd3328042 100644 --- a/libavcodec/aarch64/dcadsp_neon.S +++ b/libavcodec/aarch64/dcadsp_neon.S @@ -21,66 +21,6 @@ #include "libavutil/aarch64/asm.S" -function ff_decode_hf_neon, export=1 - add x2, x2, x3 - add x0, x0, x5, lsl #5 - add x1, x1, x5, lsl #2 - add x4, x4, x5, lsl #3 - sub x6, x6, x5 - ldr w7, [x1], #4 - add x7, x2, x7, lsl #5 - subs x6, x6, #1 - b.eq 1f - b.gt 2f - ret -2: - ldr w8, [x1], #4 - subs x6, x6, #2 - add x8, x2, x8, lsl #5 - ld1 {v2.4s}, [x4], #16 - ld1 {v0.8b}, [x7] - ld1 {v4.8b}, [x8] - sxtl v3.8h, v0.8b - sxtl v7.8h, v4.8b - scvtf v2.4s, v2.4s, #4 - sxtl v0.4s, v3.4h - sxtl2 v1.4s, v3.8h - sxtl v4.4s, v7.4h - sxtl2 v5.4s, v7.8h - scvtf v0.4s, v0.4s - scvtf v1.4s, v1.4s - scvtf v4.4s, v4.4s - scvtf v5.4s, v5.4s - fmul v0.4s, v0.4s, v2.s[0] - fmul v1.4s, v1.4s, v2.s[0] - fmul v4.4s, v4.4s, v2.s[2] - fmul v5.4s, v5.4s, v2.s[2] - b.lt 10f - - ldr w7, [x1], #4 - add x7, x2, x7, lsl #5 - st1 {v0.4s,v1.4s}, [x0], #32 - st1 {v4.4s,v5.4s}, [x0], #32 - b.gt 2b -1: - ldr w9, [x4] - ld1 {v0.8b}, [x7] - scvtf s2, w9, #4 - sxtl v3.8h, v0.8b - sxtl v0.4s, v3.4h - sxtl2 v1.4s, v3.8h - scvtf v0.4s, v0.4s - scvtf v1.4s, v1.4s - fmul v0.4s, v0.4s, v2.s[0] - fmul v1.4s, v1.4s, v2.s[0] - st1 {v0.4s,v1.4s}, [x0] - ret -10: - st1 {v0.4s,v1.4s}, [x0], #32 - st1 {v4.4s,v5.4s}, [x0] - ret -endfunc - function ff_dca_lfe_fir0_neon, export=1 mov x3, #32 // decifactor sub x1, x1, #7*4 |