1
0
Fork 0
forked from len0rd/rockbox

Fix scaling error that was introduced with r28069. With this fix the level of the hf-spectrum will be correct when decoding aac-he files.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28081 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-09-14 19:31:00 +00:00
parent e98ee2d696
commit c8da311de4

View file

@ -156,10 +156,10 @@ static void estimate_current_envelope(sbr_info *sbr, sbr_hfadj_info *adj,
for (i = l_i + sbr->tHFAdj; i < u_i + sbr->tHFAdj; i++) for (i = l_i + sbr->tHFAdj; i < u_i + sbr->tHFAdj; i++)
{ {
tmp = QMF_RE(Xsbr[i][m + sbr->kx]); tmp = QMF_RE(Xsbr[i][m + sbr->kx]);
nrg += MUL_R(tmp, tmp); nrg += MUL_R(tmp, (tmp>>REAL_BITS));
#ifndef SBR_LOW_POWER #ifndef SBR_LOW_POWER
tmp = QMF_IM(Xsbr[i][m + sbr->kx]); tmp = QMF_IM(Xsbr[i][m + sbr->kx]);
nrg += MUL_R(tmp, tmp); nrg += MUL_R(tmp, (tmp>>REAL_BITS));
#endif #endif
} }
@ -192,10 +192,10 @@ static void estimate_current_envelope(sbr_info *sbr, sbr_hfadj_info *adj,
for (j = k_l; j < k_h; j++) for (j = k_l; j < k_h; j++)
{ {
tmp = QMF_RE(Xsbr[i][j]); tmp = QMF_RE(Xsbr[i][j]);
nrg += MUL_R(tmp, tmp); nrg += MUL_R(tmp, (tmp>>REAL_BITS));
#ifndef SBR_LOW_POWER #ifndef SBR_LOW_POWER
tmp = QMF_IM(Xsbr[i][j]); tmp = QMF_IM(Xsbr[i][j]);
nrg += MUL_R(tmp, tmp); nrg += MUL_R(tmp, (tmp>>REAL_BITS));
#endif #endif
} }
} }