From 2008f76054906e9ff6bf744800af0e5a5bfe61be Mon Sep 17 00:00:00 2001 From: Alexandra Hájková Date: Fri, 18 Dec 2015 14:54:02 +0100 Subject: dca: remove unused decode_hf function and quant_d tables They were superseded with their integer equivalents. Rename integer decode_hf to decode_hf. --- libavcodec/x86/dcadsp.asm | 86 -------------------------------------------- libavcodec/x86/dcadsp_init.c | 20 ----------- 2 files changed, 106 deletions(-) (limited to 'libavcodec/x86') diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm index 18c7a0c354..89d4ac489a 100644 --- a/libavcodec/x86/dcadsp.asm +++ b/libavcodec/x86/dcadsp.asm @@ -26,92 +26,6 @@ pf_inv16: times 4 dd 0x3D800000 ; 1/16 SECTION .text -; void decode_hf(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) - -%macro DECODE_HF 0 -cglobal decode_hf, 6,6,5, dst, num, src, offset, scale, start, end - lea srcq, [srcq + offsetq] - shl startq, 2 - mov offsetd, endm -%define DICT offsetq - shl offsetq, 2 - mov endm, offsetq -.loop: -%if ARCH_X86_64 - mov offsetd, [scaleq + 2 * startq] - cvtsi2ss m0, offsetd -%else - cvtsi2ss m0, [scaleq + 2 * startq] -%endif - mov offsetd, [numq + startq] - mulss m0, [pf_inv16] - shl DICT, 5 - shufps m0, m0, 0 -%if cpuflag(sse2) -%if cpuflag(sse4) - pmovsxbd m1, [srcq + DICT + 0] - pmovsxbd m2, [srcq + DICT + 4] -%else - movq m1, [srcq + DICT] - punpcklbw m1, m1 - mova m2, m1 - punpcklwd m1, m1 - punpckhwd m2, m2 - psrad m1, 24 - psrad m2, 24 -%endif - cvtdq2ps m1, m1 - cvtdq2ps m2, m2 -%else - movd mm0, [srcq + DICT + 0] - movd mm1, [srcq + DICT + 4] - punpcklbw mm0, mm0 - punpcklbw mm1, mm1 - movq mm2, mm0 - movq mm3, mm1 - punpcklwd mm0, mm0 - punpcklwd mm1, mm1 - punpckhwd mm2, mm2 - punpckhwd mm3, mm3 - psrad mm0, 24 - psrad mm1, 24 - psrad mm2, 24 - psrad mm3, 24 - cvtpi2ps m1, mm0 - cvtpi2ps m2, mm1 - cvtpi2ps m3, mm2 - cvtpi2ps m4, mm3 - shufps m0, m0, 0 - shufps m1, m3, q1010 - shufps m2, m4, q1010 -%endif - mulps m1, m0 - mulps m2, m0 - mova [dstq + 8 * startq + 0], m1 - mova [dstq + 8 * startq + 16], m2 - add startq, 4 - cmp startq, endm - jl .loop -.end: -%if notcpuflag(sse2) - emms -%endif - REP_RET -%endmacro - -%if ARCH_X86_32 -INIT_XMM sse -DECODE_HF -%endif - -INIT_XMM sse2 -DECODE_HF - -INIT_XMM sse4 -DECODE_HF - ; %1=v0/v1 %2=in1 %3=in2 %macro FIR_LOOP 2-3 .loop%1: diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c index 7c2bec1f9b..8632c4a98f 100644 --- a/libavcodec/x86/dcadsp_init.c +++ b/libavcodec/x86/dcadsp_init.c @@ -23,15 +23,6 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/dcadsp.h" -void ff_decode_hf_sse(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS], - const int8_t hf_vq[1024][32], intptr_t vq_offset, - int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end); -void ff_decode_hf_sse2(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS], - const int8_t hf_vq[1024][32], intptr_t vq_offset, - int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end); -void ff_decode_hf_sse4(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS], - const int8_t hf_vq[1024][32], intptr_t vq_offset, - int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end); void ff_dca_lfe_fir0_sse(float *out, const float *in, const float *coefs); void ff_dca_lfe_fir1_sse(float *out, const float *in, const float *coefs); @@ -40,20 +31,9 @@ av_cold void ff_dcadsp_init_x86(DCADSPContext *s) int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_SSE(cpu_flags)) { -#if ARCH_X86_32 - s->decode_hf = ff_decode_hf_sse; -#endif s->lfe_fir[0] = ff_dca_lfe_fir0_sse; s->lfe_fir[1] = ff_dca_lfe_fir1_sse; } - - if (EXTERNAL_SSE2(cpu_flags)) { - s->decode_hf = ff_decode_hf_sse2; - } - - if (EXTERNAL_SSE4(cpu_flags)) { - s->decode_hf = ff_decode_hf_sse4; - } } -- cgit v1.2.3