Commit a46a4f72 authored by Luca Barbato's avatar Luca Barbato

dca: Refactor dca_filter_channels() a little

Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent e245d4f4
...@@ -947,15 +947,16 @@ static int dca_filter_channels(DCAContext *s, int block_index, int upsample) ...@@ -947,15 +947,16 @@ static int dca_filter_channels(DCAContext *s, int block_index, int upsample)
/* 64 subbands QMF */ /* 64 subbands QMF */
for (k = 0; k < s->audio_header.prim_channels; k++) { for (k = 0; k < s->audio_header.prim_channels; k++) {
int channel = s->channel_order_tab[k];
int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] = int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] =
s->dca_chan[k].subband_samples[block_index]; s->dca_chan[k].subband_samples[block_index];
s->fmt_conv.int32_to_float(samples[0], subband_samples[0], s->fmt_conv.int32_to_float(samples[0], subband_samples[0],
DCA_SUBBANDS_X96K * SAMPLES_PER_SUBBAND); DCA_SUBBANDS_X96K * SAMPLES_PER_SUBBAND);
if (s->channel_order_tab[k] >= 0) if (channel >= 0)
qmf_64_subbands(s, k, samples, qmf_64_subbands(s, k, samples,
s->samples_chanptr[s->channel_order_tab[k]], s->samples_chanptr[channel],
/* Upsampling needs a factor 2 here. */ /* Upsampling needs a factor 2 here. */
M_SQRT2 / 32768.0); M_SQRT2 / 32768.0);
} }
...@@ -964,15 +965,16 @@ static int dca_filter_channels(DCAContext *s, int block_index, int upsample) ...@@ -964,15 +965,16 @@ static int dca_filter_channels(DCAContext *s, int block_index, int upsample)
LOCAL_ALIGNED(32, float, samples, [DCA_SUBBANDS], [SAMPLES_PER_SUBBAND]); LOCAL_ALIGNED(32, float, samples, [DCA_SUBBANDS], [SAMPLES_PER_SUBBAND]);
for (k = 0; k < s->audio_header.prim_channels; k++) { for (k = 0; k < s->audio_header.prim_channels; k++) {
int channel = s->channel_order_tab[k];
int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] = int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] =
s->dca_chan[k].subband_samples[block_index]; s->dca_chan[k].subband_samples[block_index];
s->fmt_conv.int32_to_float(samples[0], subband_samples[0], s->fmt_conv.int32_to_float(samples[0], subband_samples[0],
DCA_SUBBANDS * SAMPLES_PER_SUBBAND); DCA_SUBBANDS * SAMPLES_PER_SUBBAND);
if (s->channel_order_tab[k] >= 0) if (channel >= 0)
qmf_32_subbands(s, k, samples, qmf_32_subbands(s, k, samples,
s->samples_chanptr[s->channel_order_tab[k]], s->samples_chanptr[channel],
M_SQRT1_2 / 32768.0); M_SQRT1_2 / 32768.0);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment