Browse code

aacsbr: Eliminate double precision arithmetic.

Originally committed as revision 24227 to svn://svn.ffmpeg.org/ffmpeg/trunk

Alex Converse authored on 2010/07/13 09:49:30
Showing 1 changed files
... ...
@@ -1580,7 +1580,7 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr,
1580 1580
                 sum[1] += sbr->e_curr[e][m];
1581 1581
             }
1582 1582
             gain_max = limgain[sbr->bs_limiter_gains] * sqrtf((FLT_EPSILON + sum[0]) / (FLT_EPSILON + sum[1]));
1583
-            gain_max = FFMIN(100000, gain_max);
1583
+            gain_max = FFMIN(100000.f, gain_max);
1584 1584
             for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
1585 1585
                 float q_m_max   = sbr->q_m[e][m] * gain_max / sbr->gain[e][m];
1586 1586
                 sbr->q_m[e][m]  = FFMIN(sbr->q_m[e][m], q_m_max);
... ...
@@ -1594,7 +1594,7 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr,
1594 1594
                           + (delta && !sbr->s_m[e][m]) * sbr->q_m[e][m] * sbr->q_m[e][m];
1595 1595
             }
1596 1596
             gain_boost = sqrtf((FLT_EPSILON + sum[0]) / (FLT_EPSILON + sum[1]));
1597
-            gain_boost = FFMIN(1.584893192, gain_boost);
1597
+            gain_boost = FFMIN(1.584893192f, gain_boost);
1598 1598
             for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
1599 1599
                 sbr->gain[e][m] *= gain_boost;
1600 1600
                 sbr->q_m[e][m]  *= gain_boost;