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_fixed.c | |
| parent | 50ce510ac4e3ed093c051738242a9a75aeeb36ce (diff) | |
| download | ffmpeg-streaming-bfd0e02dd64e912a6b67c25d9f86b3b0b849ad10.zip ffmpeg-streaming-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_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 b4e3ac7..6ec39c1 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -190,13 +190,13 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) SoftFloat temp1, temp2, fac; temp1.exp = NOISE_FLOOR_OFFSET - \ - sbr->data[0].noise_facs[e][k].mant + 2; + sbr->data[0].noise_facs_q[e][k] + 2; temp1.mant = 0x20000000; if (temp1.exp > 66) { // temp1 > 1E20 av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow in dequant\n"); temp1 = FLOAT_1; } - temp2.exp = 12 - sbr->data[1].noise_facs[e][k].mant + 1; + temp2.exp = 12 - sbr->data[1].noise_facs_q[e][k] + 1; temp2.mant = 0x20000000; fac = av_div_sf(temp1, av_add_sf(FLOAT_1, temp2)); sbr->data[0].noise_facs[e][k] = fac; @@ -225,7 +225,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].exp = NOISE_FLOOR_OFFSET - \ - sbr->data[ch].noise_facs[e][k].mant + 1; + sbr->data[ch].noise_facs_q[e][k] + 1; sbr->data[ch].noise_facs[e][k].mant = 0x20000000; } } |
