summaryrefslogtreecommitdiff
path: root/libavcodec/dcadsp.c
diff options
context:
space:
mode:
authorAlexandra Hájková <alexandra.khirnova@gmail.com>2015-12-18 14:54:02 +0100
committerJanne Grunau <janne-libav@jannau.net>2015-12-24 13:58:18 +0100
commit2008f76054906e9ff6bf744800af0e5a5bfe61be (patch)
tree4981d3e41d9d5b13d904d91da6342ba74020e1b9 /libavcodec/dcadsp.c
parentaebf07075f4244caf591a3af71e5872fe314e87b (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/dcadsp.c')
-rw-r--r--libavcodec/dcadsp.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index c333f4a44c..ec3561dd54 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -27,30 +27,12 @@
#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][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, 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;
for (j = start; j < end; j++) {
@@ -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)