[FFmpeg-cvslog] avcodec/aacsbr: Replace a noise_facs_q check by an av_assert0

Michael Niedermayer git at videolan.org
Thu Nov 19 13:55:45 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Nov 19 13:32:40 2015 +0100| [58fba4b02f65e8f9878cd5e41d24bb8e452f6631] | committer: Michael Niedermayer

avcodec/aacsbr: Replace a noise_facs_q check by an av_assert0

The replaced check should have become redundant

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58fba4b02f65e8f9878cd5e41d24bb8e452f6631
---

 libavcodec/aacsbr.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 7fb21cc..f7c9b22 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -96,10 +96,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac)
                 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");
-                    temp1 = 1;
-                }
+                av_assert0(temp1 <= 1E20);
                 fac = temp1 / (1.0f + temp2);
                 sbr->data[0].noise_facs[e][k] = fac;
                 sbr->data[1].noise_facs[e][k] = fac * temp2;



More information about the ffmpeg-cvslog mailing list