Changeset 71 for mppenc/branches/r2d/libmpcpsy/libmpcpsy.h

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/libmpcpsy.h (modified) (3 diffs)

mppenc/branches/r2d/libmpcpsy/libmpcpsy.h

@@ -64 +64 @@
         unsigned int  MS_Channelmode;
 
-        float         a          [PART_LONG];
-        float         b          [PART_LONG];
-        float         c          [PART_LONG];
-        float         d          [PART_LONG];           // Integrations for tmpMask
-        float         T_L        [PART_LONG];
-        float         T_R        [PART_LONG];           // time-constants for tmpMask
-        float         pre_erg_L[2][PART_SHORT];
-        float         pre_erg_R[2][PART_SHORT];          // Preecho-control short
-        float         PreThr_L   [PART_LONG];
-        float         PreThr_R   [PART_LONG];           // for Pre-Echo-control L/R
-        float         tmp_Mask_L [PART_LONG];
-        float         tmp_Mask_R [PART_LONG];           // for Post-Masking L/R
-        int           Vocal_L    [MAX_CVD_LINE + 4];
-        int           Vocal_R    [MAX_CVD_LINE + 4];    // FFT-Line belongs to harmonic?
-
         /* V A R I A B L E S */
-        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)
         float  Ltq_offset;                         // Offset for threshold in quiet
         float  Ltq_max;                            // maximum level for threshold in quiet
@@ -104 +79 @@
         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
         float         SNR_comp_L [32];
         float         SNR_comp_R [32];             // SNR-compensation after SCF-combination and ANS-gain
@@ -115 +86 @@
 
         // FIXME : remove this :
-        int            SCF_Index_L [32] [3];
-        int            SCF_Index_R [32] [3];              // Scalefactor-index for Bitstream
+        int * SCF_Index_L;
+        int * SCF_Index_R;              // Scalefactor-index for Bitstream
 
 } PsyModel;