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_fixed.c | |
| parent | b4f1636a4d7787eccf022ce2433cd9ce53e407cc (diff) | |
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_fixed.c')
| -rw-r--r-- | libavcodec/aacsbr_fixed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index 2473de4ec5..b26314a7eb 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -163,7 +163,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (k = 0; k < sbr->n[sbr->data[0].bs_freq_res[e]]; k++) { SoftFloat temp1, temp2, fac; - temp1.exp = sbr->data[0].env_facs[e][k].mant * alpha + 14; + temp1.exp = sbr->data[0].env_facs_q[e][k] * alpha + 14; if (temp1.exp & 1) temp1.mant = 759250125; else @@ -174,7 +174,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) temp1 = FLOAT_1; } - temp2.exp = (pan_offset - sbr->data[1].env_facs[e][k].mant) * alpha; + temp2.exp = (pan_offset - sbr->data[1].env_facs_q[e][k]) * alpha; if (temp2.exp & 1) temp2.mant = 759250125; else @@ -207,7 +207,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[e]]; k++){ SoftFloat temp1; - temp1.exp = alpha * sbr->data[ch].env_facs[e][k].mant + 12; + temp1.exp = alpha * sbr->data[ch].env_facs_q[e][k] + 12; if (temp1.exp & 1) temp1.mant = 759250125; else |