Commit dcf1cf5d authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/aacsbr: Use FLOAT_0

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent a66b243d
...@@ -397,7 +397,7 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr, ...@@ -397,7 +397,7 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr,
int delta = !((e == e_a[1]) || (e == e_a[0])); int delta = !((e == e_a[1]) || (e == e_a[0]));
for (k = 0; k < sbr->n_lim; k++) { for (k = 0; k < sbr->n_lim; k++) {
SoftFloat gain_boost, gain_max; SoftFloat gain_boost, gain_max;
SoftFloat sum[2] = { { 0, 0}, { 0, 0 } }; SoftFloat sum[2] = { FLOAT_0, FLOAT_0 };
for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) { for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
const SoftFloat temp = av_div_sf(sbr->e_origmapped[e][m], const SoftFloat temp = av_div_sf(sbr->e_origmapped[e][m],
av_add_sf(FLOAT_1, sbr->q_mapped[e][m])); av_add_sf(FLOAT_1, sbr->q_mapped[e][m]));
......
...@@ -1414,7 +1414,7 @@ static void sbr_env_estimate(AAC_FLOAT (*e_curr)[48], INTFLOAT X_high[64][40][2] ...@@ -1414,7 +1414,7 @@ static void sbr_env_estimate(AAC_FLOAT (*e_curr)[48], INTFLOAT X_high[64][40][2]
for (p = 0; p < sbr->n[ch_data->bs_freq_res[e + 1]]; p++) { for (p = 0; p < sbr->n[ch_data->bs_freq_res[e + 1]]; p++) {
#if USE_FIXED #if USE_FIXED
SoftFloat sum = { 0, 0 }; SoftFloat sum = FLOAT_0;
const SoftFloat den = av_int2sf(0x20000000 / (env_size * (table[p + 1] - table[p])), 29); const SoftFloat den = av_int2sf(0x20000000 / (env_size * (table[p + 1] - table[p])), 29);
for (k = table[p]; k < table[p + 1]; k++) { for (k = table[p]; k < table[p + 1]; k++) {
sum = av_add_sf(sum, sbr->dsp.sum_square(X_high[k] + ilb, iub - ilb)); sum = av_add_sf(sum, sbr->dsp.sum_square(X_high[k] + ilb, iub - ilb));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment