Changeset 71 for mppenc/branches/r2d/libmpcpsy/ans.c

Timestamp:

10/07/06 02:49:28 (18 years ago)

Author:

r2d

Message:

• fixed a LOT of bugs
• fixed a bug that took me 2 days to find :)
• remember to ALWAYS use -Wall with a C compiler (C++ is great !!!)
• files can be played, but are not bit identical with the 1.15w encoder (the last digits of floats are not the same) - must be fixed.

File:

• mppenc/branches/r2d/libmpcpsy/ans.c (modified) (2 diffs)

mppenc/branches/r2d/libmpcpsy/ans.c

@@ -38 +38 @@
 static float  Sin_Tab    [16] [MAX_NS_ORDER + 1];
 
+float         ANSspec_L  [MAX_ANS_LINES];
+float         ANSspec_R  [MAX_ANS_LINES];       // L/R-masking thresholds for ANS
+float         ANSspec_M  [MAX_ANS_LINES];
+float         ANSspec_S  [MAX_ANS_LINES];       // M/S-masking thresholds for ANS
 
 void
@@ -284 +288 @@
     memset ( m->FIR_L,      0, sizeof m->FIR_L      );         // reset FIR
     memset ( m->NS_Order_L, 0, sizeof m->NS_Order_L );         // reset Flags
-        FindOptimalANS ( MaxBand, MSflag, m->ANSspec_L, m->ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient );
+        FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient );
 
     // for R or S, respectively
         memset ( m->FIR_R,      0, sizeof m->FIR_R      );         // reset FIR
         memset ( m->NS_Order_R, 0, sizeof m->NS_Order_R );         // reset Flags
-        FindOptimalANS ( MaxBand, MSflag, m->ANSspec_R, m->ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient );
+        FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient );
 
     return;