summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-08-23 23:14:32 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-08-23 23:14:32 +0000
commit20de4c55a2ddfa802a01cc353884d73a934bf7ba (patch)
tree67426016d2cc64f661f53a29725005ad4bdc2655
parentaea21cd18be1069e23d4703fd1daca616e2c2940 (diff)
downloadrockbox-20de4c55a2ddfa802a01cc353884d73a934bf7ba.zip
rockbox-20de4c55a2ddfa802a01cc353884d73a934bf7ba.tar.gz
rockbox-20de4c55a2ddfa802a01cc353884d73a934bf7ba.tar.bz2
rockbox-20de4c55a2ddfa802a01cc353884d73a934bf7ba.tar.xz
Fix libfaad error that was introduced with r27225. Noise bursts during playback of several files were reported in the forums.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27868 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libfaad/specrec.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/apps/codecs/libfaad/specrec.c b/apps/codecs/libfaad/specrec.c
index d21a923..02eac11 100644
--- a/apps/codecs/libfaad/specrec.c
+++ b/apps/codecs/libfaad/specrec.c
@@ -606,12 +606,19 @@ static uint8_t quant_to_spec(NeAACDecHandle hDecoder,
#else
wb = wa + bin;
-
- spec_data[wb+0] = MUL_C((iquant(quant_data[k+0], tab, &error)<<exp), scf);
- spec_data[wb+1] = MUL_C((iquant(quant_data[k+1], tab, &error)<<exp), scf);
- spec_data[wb+2] = MUL_C((iquant(quant_data[k+2], tab, &error)<<exp), scf);
- spec_data[wb+3] = MUL_C((iquant(quant_data[k+3], tab, &error)<<exp), scf);
-
+
+ if (exp>=0)
+ {
+ spec_data[wb+0] = MUL_C((iquant(quant_data[k+0], tab, &error)<< exp), scf);
+ spec_data[wb+1] = MUL_C((iquant(quant_data[k+1], tab, &error)<< exp), scf);
+ spec_data[wb+2] = MUL_C((iquant(quant_data[k+2], tab, &error)<< exp), scf);
+ spec_data[wb+3] = MUL_C((iquant(quant_data[k+3], tab, &error)<< exp), scf);
+ } else {
+ spec_data[wb+0] = MUL_C((iquant(quant_data[k+0], tab, &error)>>-exp), scf);
+ spec_data[wb+1] = MUL_C((iquant(quant_data[k+1], tab, &error)>>-exp), scf);
+ spec_data[wb+2] = MUL_C((iquant(quant_data[k+2], tab, &error)>>-exp), scf);
+ spec_data[wb+3] = MUL_C((iquant(quant_data[k+3], tab, &error)>>-exp), scf);
+ }
//#define SCFS_PRINT
#ifdef SCFS_PRINT
printf("%d\n", spec_data[gindex+(win*win_inc)+j+bin+0]);