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

Timestamp:

09/28/06 18:15:21 (18 years ago)

Author:

r2d

Message:

added a PsyModel struct, too much members in it. some will be removed later

File:

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

mppenc/branches/r2d/libmpcpsy/ans.c

@@ -28 +28 @@
  */
 
-#include "mppenc.h"
+#include "libmpcpsy.h"
+
+#include <math.h>
+#include <string.h>
 
 
@@ -34 +37 @@
 static float  Cos_Tab    [16] [MAX_NS_ORDER + 1];
 static float  Sin_Tab    [16] [MAX_NS_ORDER + 1];
-unsigned int  NS_Order;                         // Maximum order for ANS
-unsigned int  NS_Order_L [32];
-unsigned int  NS_Order_R [32];                  // frame-wise order of the Noiseshaping (0: off, 1...5: on)
-float         FIR_L      [32] [MAX_NS_ORDER];
-float         FIR_R      [32] [MAX_NS_ORDER];   // contains FIR-Filter for NoiseShaping
-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
 
 
@@ -184 +178 @@
     const float*  tmp;
 
-    ENTER(235);
     for ( Band = 0; Band <= MaxBand  &&  maxANSOrder[Band]; Band++ ) {
 
@@ -275 +268 @@
     }
 
-    LEAVE(235);
     return;
 }
@@ -282 +274 @@
 // perform ANS-analysis (calculation of FIR-filter and gain)
 void
-NS_Analyse ( const int             MaxBand,
+NS_Analyse ( PsyModel* m,
+                         const int             MaxBand,
              const unsigned char*  MSflag,
              const SMRTyp          smr,
              const int*            Transient )
 {
-    ENTER(10);
 
     // for L or M, respectively
-    memset ( FIR_L,      0, sizeof FIR_L      );         // reset FIR
-    memset ( NS_Order_L, 0, sizeof NS_Order_L );         // reset Flags
-    FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, NS_Order_L, SNR_comp_L, FIR_L, smr.L, smr.M, SCF_Index_L, Transient );
+    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 );
 
     // for R or S, respectively
-    memset ( FIR_R,      0, sizeof FIR_R      );         // reset FIR
-    memset ( NS_Order_R, 0, sizeof NS_Order_R );         // reset Flags
-    FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, NS_Order_R, SNR_comp_R, FIR_R, smr.R, smr.S, SCF_Index_R, Transient );
-
-    LEAVE(10);
+        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 );
+
     return;
 }