diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 13:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-12 12:19:07 +0100 |
| commit | b78885a3c5bcc531ef3410b2d7592a9b08392505 (patch) | |
| tree | ce12ef1638ef1e4c7e03354140fec6f9aac33e65 /libavcodec/aacsbr.c | |
| parent | b4f1636a4d7787eccf022ce2433cd9ce53e407cc (diff) | |
| download | ffmpeg-b78885a3c5bcc531ef3410b2d7592a9b08392505.tar.gz | |
avcodec/aacsbr: Split the env_facs table
This also removes a #ifdef and special case for the fixed point case
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/aacsbr.c')
| -rw-r--r-- | libavcodec/aacsbr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index f7c9b22d7f..d1e3a91e96 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -79,8 +79,8 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) float pan_offset = sbr->data[0].bs_amp_res ? 12.0f : 24.0f; for (e = 1; e <= sbr->data[0].bs_num_env; e++) { for (k = 0; k < sbr->n[sbr->data[0].bs_freq_res[e]]; k++) { - float temp1 = exp2f(sbr->data[0].env_facs[e][k] * alpha + 7.0f); - float temp2 = exp2f((pan_offset - sbr->data[1].env_facs[e][k]) * alpha); + float temp1 = exp2f(sbr->data[0].env_facs_q[e][k] * alpha + 7.0f); + float temp2 = exp2f((pan_offset - sbr->data[1].env_facs_q[e][k]) * alpha); float fac; if (temp1 > 1E20) { av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow in dequant\n"); @@ -108,7 +108,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (e = 1; e <= sbr->data[ch].bs_num_env; e++) for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[e]]; k++){ sbr->data[ch].env_facs[e][k] = - exp2f(alpha * sbr->data[ch].env_facs[e][k] + 6.0f); + exp2f(alpha * sbr->data[ch].env_facs_q[e][k] + 6.0f); if (sbr->data[ch].env_facs[e][k] > 1E20) { av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow in dequant\n"); sbr->data[ch].env_facs[e][k] = 1; |