summaryrefslogtreecommitdiff
path: root/libavcodec/dcadsp.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 17:52:34 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 17:52:34 +0100
commit7fe77aa62ea2ca376057436a6c36a759e8273f15 (patch)
tree95c4471532ba5811cb5f249a6b90909ba46c448f /libavcodec/dcadsp.c
parent2214207d048187b85cd3af3e54b064f87728aa07 (diff)
parent40d949677335a564f769823f4afdb7e7a3da8d6b (diff)
Merge commit '40d949677335a564f769823f4afdb7e7a3da8d6b'
* commit '40d949677335a564f769823f4afdb7e7a3da8d6b': dca: use defines for subband related constants Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dcadsp.c')
-rw-r--r--libavcodec/dcadsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index 3fb70c6c4c..32b149d09c 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -27,7 +27,7 @@
#include "dcadsp.h"
#include "dcamath.h"
-static void decode_hf_c(int32_t 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],
@@ -62,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],
@@ -103,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));
}