diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 12:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 13:12:20 +0100 |
| commit | bfd0e02dd64e912a6b67c25d9f86b3b0b849ad10 (patch) | |
| tree | 842fbb097a5fd1bdb1833fd52e7ea148220f6c1f /libavcodec/aacsbr.c | |
| parent | 50ce510ac4e3ed093c051738242a9a75aeeb36ce (diff) | |
| download | ffmpeg-bfd0e02dd64e912a6b67c25d9f86b3b0b849ad10.tar.gz | |
avcodec/aacsbr: Split pre dequantization noise factors table
This allows removing a special case for the fixed point decoder and will
make error checks simpler
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 81f1902822..7fb21cc3fb 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -93,8 +93,8 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) } for (e = 1; e <= sbr->data[0].bs_num_noise; e++) { for (k = 0; k < sbr->n_q; k++) { - float temp1 = exp2f(NOISE_FLOOR_OFFSET - sbr->data[0].noise_facs[e][k] + 1); - float temp2 = exp2f(12 - sbr->data[1].noise_facs[e][k]); + float temp1 = exp2f(NOISE_FLOOR_OFFSET - sbr->data[0].noise_facs_q[e][k] + 1); + float temp2 = exp2f(12 - sbr->data[1].noise_facs_q[e][k]); float fac; if (temp1 > 1E20) { av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow in dequant\n"); @@ -121,7 +121,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (e = 1; e <= sbr->data[ch].bs_num_noise; e++) for (k = 0; k < sbr->n_q; k++) sbr->data[ch].noise_facs[e][k] = - exp2f(NOISE_FLOOR_OFFSET - sbr->data[ch].noise_facs[e][k]); + exp2f(NOISE_FLOOR_OFFSET - sbr->data[ch].noise_facs_q[e][k]); } } } |