lavc: Drop deprecated voxware codec entry

[ffmpeg] / libavcodec / dcadsp.c

diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index c333f4a44c4867b1c4ae21f3989aac594f7eed95..beec2007f63587b130956911995fafcb6692ff80 100644 (file)
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -27,29 +27,11 @@
 #include "dcadsp.h"
 #include "dcamath.h"
 
-static void decode_hf_c(float dst[DCA_SUBBANDS][8],
+static void decode_hf_c(int32_t dst[DCA_SUBBANDS][SAMPLES_PER_SUBBAND],
                         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)
-{
-    int i, l;
-
-    for (l = start; l < end; l++) {
-        /* 1 vector -> 32 samples but we only need the 8 samples
-         * for this subsubframe. */
-        const int8_t *ptr = &hf_vq[vq_num[l]][vq_offset];
-        float fscale = scale[l][0] * (1 / 16.0);
-        for (i = 0; i < 8; i++)
-            dst[l][i] = ptr[i] * fscale;
-    }
-}
-
-static void decode_hf_int_c(int32_t 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)
 {
     int i, j;
 
@@ -80,7 +62,7 @@ static inline void dca_lfe_fir(float *out, const float *in, const float *coefs,
     }
 }
 
-static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
+static void dca_qmf_32_subbands(float samples_in[DCA_SUBBANDS][SAMPLES_PER_SUBBAND], int sb_act,
                                 SynthFilterContext *synth, FFTContext *imdct,
                                 float synth_buf_ptr[512],
                                 int *synth_buf_offset, float synth_buf2[32],
@@ -121,7 +103,7 @@ static void dequantize_c(int32_t *samples, uint32_t step_size, uint32_t scale)
         shift = 0;
     step_scale = (int32_t)(step >> shift);
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < SAMPLES_PER_SUBBAND; i++)
         samples[i] = dca_clip23(dca_norm((int64_t)samples[i] * step_scale, 22 - shift));
 }
 
@@ -141,7 +123,6 @@ av_cold void ff_dcadsp_init(DCADSPContext *s)
     s->lfe_fir[1]      = dca_lfe_fir1_c;
     s->qmf_32_subbands = dca_qmf_32_subbands;
     s->decode_hf       = decode_hf_c;
-    s->decode_hf_int   = decode_hf_int_c;
     s->dequantize      = dequantize_c;
 
     if (ARCH_AARCH64)