This prevents various values from getting an insanely huge exponent.
If someone knows a cleaner solution, thats welcome!
This is similar to commit 8978c74 for aacsbr.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavcodec/aacsbr_fixed.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c
index efe40f2..57ff28a 100644
--- a/libavcodec/aacsbr_fixed.c
+++ b/libavcodec/aacsbr_fixed.c
@@ -169,6 +169,10 @@ static void sbr_dequant(SpectralBandReplication *sbr, int
id_aac)
else
temp1.mant = 0x20000000;
temp1.exp = (temp1.exp >> 1) + 1;
+ if (temp1.exp > 66) { // temp1 > 1E20
+ av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow
in dequant\n");
+ temp1 = FLOAT_1;
+ }
temp2.exp = (pan_offset - sbr->data[1].env_facs[e][k].mant) *
alpha;
if (temp2.exp & 1)
@@ -188,6 +192,10 @@ static void sbr_dequant(SpectralBandReplication *sbr, int
id_aac)
temp1.exp = NOISE_FLOOR_OFFSET - \
sbr->data[0].noise_facs[e][k].mant + 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.mant = 0x20000000;
fac = av_div_sf(temp1, av_add_sf(FLOAT_1, temp2));
@@ -208,7 +216,10 @@ static void sbr_dequant(SpectralBandReplication *sbr, int
id_aac)
else
temp1.mant = 0x20000000;
temp1.exp = (temp1.exp >> 1) + 1;
-
+ if (temp1.exp > 66) { // temp1 > 1E20
+ av_log(NULL, AV_LOG_ERROR, "envelope scalefactor
overflow in dequant\n");
+ temp1 = FLOAT_1;
+ }
sbr->data[ch].env_facs[e][k] = temp1;
}
for (e = 1; e <= sbr->data[ch].bs_num_noise; e++)
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
