Changeset 71 for mppenc/branches/r2d/libmpcpsy/psy_tab.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/psy_tab.c (modified) (7 diffs)

mppenc/branches/r2d/libmpcpsy/psy_tab.c

@@ -47 +47 @@
 const float iw_short [PART_SHORT] = { 1.f, 1.f, 1.f, 1.f, 1.f/2, 1.f/2, 1.f/2, 1.f/2, 1.f/3, 1.f/3, 1.f/4, 1.f/6, 1.f/7, 1.f/8, 1.f/11, 1.f/13, 1.f/17, 1.f/25, 1.f/29 };
 
+float  MinVal   [PART_LONG];               // contains minimum tonality soffsets
+float  Loudness [PART_LONG];               // weighting factors for loudness calculation
+float  SPRD     [PART_LONG] [PART_LONG];   // tabulated spreading function
+float  O_MAX;
+float  O_MIN;
+float  FAC1;
+float  FAC2;                               // constants for offset calculation
+float  partLtq  [PART_LONG];               // threshold in quiet (partitions)
+float  invLtq   [PART_LONG];               // inverse threshold in quiet (partitions, long)
+float  fftLtq   [512];                     // threshold in quiet (FFT)
 
 static float
@@ -165 +175 @@
         tmp       = mind ( tmp, Ltq_max );              // Limit ATH
         tmp      += Ltq_offset - 23;                    // Add chosen Offset
-        m->fftLtq[n] = absLtq[n] = POW10 ( 0.1 * tmp);     // conversion into power
+        fftLtq[n] = absLtq[n] = POW10 ( 0.1 * tmp);     // conversion into power
     }
 
@@ -174 +184 @@
             erg = minf (erg, absLtq[k]);
 
-                m->partLtq[n] = erg;               // threshold in quiet
-                m->invLtq [n] = 1.f / m->partLtq[n];  // Inverse
+                partLtq[n] = erg;               // threshold in quiet
+                invLtq [n] = 1.f / partLtq[n];  // Inverse
     }
 }
@@ -219 +229 @@
         tmp          = LOG10 (midfreq) - 3.5f;                                  // dB(A)
         tmp          = -10 * tmp * tmp + 3 - midfreq/3000;
-                m->Loudness [n] = POW10 ( 0.1 * tmp );                                     // conversion into power
+                Loudness [n] = POW10 ( 0.1 * tmp );                                     // conversion into power
     }
 }
@@ -286 +296 @@
     for ( n = 0; n < PART_LONG; n++ ) {
                 tmp        = Bass ( (wl [n] + wh [n]) / 2048. * m->SampleFreq, m->TMN, m->NMT, bass );
-                m->MinVal [n] = POW10 ( -0.1 * tmp );                      // conversion into power
+                MinVal [n] = POW10 ( -0.1 * tmp );                      // conversion into power
     }
 
     // calculation of the constants for "tonality offset"
-        m->O_MAX = POW10 ( -0.1 * m->TMN );
-        m->O_MIN = POW10 ( -0.1 * m->NMT );
-        m->FAC1  = POW10 ( -0.1 * (m->NMT - (m->TMN - m->NMT) * 0.229) ) ;
-        m->FAC2  = (m->TMN - m->NMT) * (0.99011159 * 0.1);
+        O_MAX = POW10 ( -0.1 * m->TMN );
+        O_MIN = POW10 ( -0.1 * m->NMT );
+        FAC1  = POW10 ( -0.1 * (m->NMT - (m->TMN - m->NMT) * 0.229) ) ;
+        FAC2  = (m->TMN - m->NMT) * (0.99011159 * 0.1);
 }
 
@@ -333 +343 @@
 
             // calculate coefficient
-                        m->SPRD[i][j] = POW10 ( -0.1 * (tmpy+tmpz) );  // [Source] [Target]
+                        SPRD[i][j] = POW10 ( -0.1 * (tmpy+tmpz) );  // [Source] [Target]
         }
     }
@@ -341 +351 @@
         float  norm = 0.f;
         for ( j = 0; j < PART_LONG; j++ )               // j is masking Partition
-                        norm += m->SPRD [j] [i];
+                        norm += SPRD [j] [i];
         for ( j = 0; j < PART_LONG; j++ )               // j is masking Partition
-                        m->SPRD [j] [i] /= norm;
+                        SPRD [j] [i] /= norm;
     }
 }