diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 17:52:34 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 17:52:34 +0100 |
| commit | 7fe77aa62ea2ca376057436a6c36a759e8273f15 (patch) | |
| tree | 95c4471532ba5811cb5f249a6b90909ba46c448f /libavcodec/dcadsp.h | |
| parent | 2214207d048187b85cd3af3e54b064f87728aa07 (diff) | |
| parent | 40d949677335a564f769823f4afdb7e7a3da8d6b (diff) | |
| download | ffmpeg-7fe77aa62ea2ca376057436a6c36a759e8273f15.tar.gz | |
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.h')
| -rw-r--r-- | libavcodec/dcadsp.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/dcadsp.h b/libavcodec/dcadsp.h index ccb2955470..8c8db854a4 100644 --- a/libavcodec/dcadsp.h +++ b/libavcodec/dcadsp.h @@ -22,17 +22,20 @@ #include "avfft.h" #include "synth_filter.h" -#define DCA_SUBBANDS 64 +#define DCA_SUBBANDS_X96K 64 +#define DCA_SUBBANDS 64 +#define SAMPLES_PER_SUBBAND 8 // number of samples per subband per subsubframe + typedef struct DCADSPContext { void (*lfe_fir[2])(float *out, const float *in, const float *coefs); - void (*qmf_32_subbands)(float samples_in[32][8], int sb_act, + void (*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], const float window[512], float *samples_out, float raXin[32], float scale); - void (*decode_hf)(int32_t dst[DCA_SUBBANDS][8], + void (*decode_hf)(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], |