diff options
author | Ben Avison <bavison@riscosopen.org> | 2013-07-15 21:28:16 +0400 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-07-22 11:15:42 +0400 |
commit | 800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e (patch) | |
tree | c7c9d444d9c22153321ba3ec840fd5b48a48214b | |
parent | 8b9eba664edaddf9a304d3acbf0388b5c520781d (diff) |
dcadsp: Add a new method, qmf_32_subbands
This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r-- | libavcodec/dcadec.c | 26 | ||||
-rw-r--r-- | libavcodec/dcadsp.c | 30 | ||||
-rw-r--r-- | libavcodec/dcadsp.h | 9 |
3 files changed, 44 insertions, 21 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index b53f46b74c..209bca34ff 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -946,10 +946,8 @@ static void qmf_32_subbands(DCAContext *s, int chans, float scale) { const float *prCoeff; - int i; int sb_act = s->subband_activity[chans]; - int subindex; scale *= sqrt(1 / 8.0); @@ -959,25 +957,11 @@ static void qmf_32_subbands(DCAContext *s, int chans, else /* Perfect reconstruction */ prCoeff = fir_32bands_perfect; - for (i = sb_act; i < 32; i++) - s->raXin[i] = 0.0; - - /* Reconstructed channel sample index */ - for (subindex = 0; subindex < 8; subindex++) { - /* Load in one sample from each subband and clear inactive subbands */ - for (i = 0; i < sb_act; i++) { - unsigned sign = (i - 1) & 2; - uint32_t v = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30; - AV_WN32A(&s->raXin[i], v); - } - - s->synth.synth_filter_float(&s->imdct, - s->subband_fir_hist[chans], - &s->hist_index[chans], - s->subband_fir_noidea[chans], prCoeff, - samples_out, s->raXin, scale); - samples_out += 32; - } + s->dcadsp.qmf_32_subbands(samples_in, sb_act, &s->synth, &s->imdct, + s->subband_fir_hist[chans], + &s->hist_index[chans], + s->subband_fir_noidea[chans], prCoeff, + samples_out, s->raXin, scale); } static void lfe_interpolation_fir(DCAContext *s, int decimation_select, diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c index 8b2dd42f10..57d716e402 100644 --- a/libavcodec/dcadsp.c +++ b/libavcodec/dcadsp.c @@ -21,6 +21,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "dcadsp.h" static void dca_lfe_fir_c(float *out, const float *in, const float *coefs, @@ -45,8 +46,37 @@ static void dca_lfe_fir_c(float *out, const float *in, const float *coefs, } } +static void dca_qmf_32_subbands(float samples_in[32][8], 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) +{ + int i; + int subindex; + + for (i = sb_act; i < 32; i++) + raXin[i] = 0.0; + + /* Reconstructed channel sample index */ + for (subindex = 0; subindex < 8; subindex++) { + /* Load in one sample from each subband and clear inactive subbands */ + for (i = 0; i < sb_act; i++) { + unsigned sign = (i - 1) & 2; + uint32_t v = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30; + AV_WN32A(&raXin[i], v); + } + + synth->synth_filter_float(imdct, synth_buf_ptr, synth_buf_offset, + synth_buf2, window, samples_out, raXin, scale); + samples_out += 32; + } +} + av_cold void ff_dcadsp_init(DCADSPContext *s) { s->lfe_fir = dca_lfe_fir_c; + s->qmf_32_subbands = dca_qmf_32_subbands; if (ARCH_ARM) ff_dcadsp_init_arm(s); } diff --git a/libavcodec/dcadsp.h b/libavcodec/dcadsp.h index 3c6f1f9a9f..ec88be71f0 100644 --- a/libavcodec/dcadsp.h +++ b/libavcodec/dcadsp.h @@ -19,9 +19,18 @@ #ifndef AVCODEC_DCADSP_H #define AVCODEC_DCADSP_H +#include "avfft.h" +#include "synth_filter.h" + typedef struct DCADSPContext { void (*lfe_fir)(float *out, const float *in, const float *coefs, int decifactor, float scale); + void (*qmf_32_subbands)(float samples_in[32][8], 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); } DCADSPContext; void ff_dcadsp_init(DCADSPContext *s); |