diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:29:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:32:14 +0100 |
| commit | 747b0337e70b99bed24c440e35bd14b33e1c2d99 (patch) | |
| tree | dfccb64b975037e4f10c7fcb1b415037821b5a57 | |
| parent | baf3adc621feed563f0d12479519c600b26b768c (diff) | |
| parent | 7686afd049be98d18663682b92d983340fa2c305 (diff) | |
| download | ffmpeg-747b0337e70b99bed24c440e35bd14b33e1c2d99.tar.gz | |
Merge commit '7686afd049be98d18663682b92d983340fa2c305'
* commit '7686afd049be98d18663682b92d983340fa2c305':
dca: factorize scaling in inverse ADPCM
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dcadec.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 880df81ceb..756e53f37e 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1353,16 +1353,27 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index) */ if (s->prediction_mode[k][l]) { int n; - for (m = 0; m < 8; m++) { - for (n = 1; n <= 4; n++) + if (s->predictor_history) + subband_samples[k][l][0] += (adpcm_vb[s->prediction_vq[k][l]][0] * + s->subband_samples_hist[k][l][3] + + adpcm_vb[s->prediction_vq[k][l]][1] * + s->subband_samples_hist[k][l][2] + + adpcm_vb[s->prediction_vq[k][l]][2] * + s->subband_samples_hist[k][l][1] + + adpcm_vb[s->prediction_vq[k][l]][3] * + s->subband_samples_hist[k][l][0]) * + (1.0f / 8192); + for (m = 1; m < 8; m++) { + float sum = adpcm_vb[s->prediction_vq[k][l]][0] * + subband_samples[k][l][m - 1]; + for (n = 2; n <= 4; n++) if (m >= n) - subband_samples[k][l][m] += - (adpcm_vb[s->prediction_vq[k][l]][n - 1] * - subband_samples[k][l][m - n] / 8192); + sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] * + subband_samples[k][l][m - n]; else if (s->predictor_history) - subband_samples[k][l][m] += - (adpcm_vb[s->prediction_vq[k][l]][n - 1] * - s->subband_samples_hist[k][l][m - n + 4] / 8192); + sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] * + s->subband_samples_hist[k][l][m - n + 4]; + subband_samples[k][l][m] += sum * 1.0f / 8192; } } } |