Changeset 71 for mppenc/branches/r2d/src/mppenc.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/src/mppenc.h (modified) (4 diffs)

mppenc/branches/r2d/src/mppenc.h

@@ -57 +57 @@
 } wave_t;
 
-// ans.c
-// extern unsigned int  NS_Order;                          // global Flag for Noise Shaping
-// extern unsigned int  NS_Order_L [32];
-// extern unsigned int  NS_Order_R [32];                   // order of the Adaptive Noiseshaping (0: off, 1...5: on)
-// extern float         FIR_L     [32] [MAX_NS_ORDER];
-// extern float         FIR_R     [32] [MAX_NS_ORDER];     // contains FIR-Filter for NoiseShaping
-// extern float         ANSspec_L [MAX_ANS_LINES];
-// extern float         ANSspec_R [MAX_ANS_LINES];         // L/R-masking threshold for ANS
-// extern float         ANSspec_M [MAX_ANS_LINES];
-// extern float         ANSspec_S [MAX_ANS_LINES];         // M/S-masking threshold for ANS
-
-
-// extern Uint32_t      Buffer [BUFFER_FULL];      // buffer for bitstream file (128 KB)
-// extern Uint32_t      dword;                     // 32 bit-Word for Bitstream-I/O
-// extern unsigned int  Zaehler;                   // position counter for processed bitstream word (32 bit)
-// extern UintMax_t     BufferedBits;              // counter for the number of written bits in the bitstream
-
 // FIXME : put in lib header
 void  FlushBitstream    ( FILE* fp, const mpc_uint32_t* buffer, size_t words32bit );
@@ -81 +64 @@
 void  GetBitstreamPos   ( mpc_encoder_t*, BitstreamPos* const pos );
 
-// cvd.c
-int    CVD2048 ( PsyModel*, const float*, int* );
+void   Init_FFT      ( PsyModel* );
 
 
@@ -91 +73 @@
 extern const float  tabsqrt_ex [];
 extern const float  tabsqrt_m  [] [2];
-
-
-// fft4g.c
-void   rdft                ( const int, float*, int*, float* );
-void   Generate_FFT_Tables ( const int, int*, float* );
 
 // FIXME : put in lib header
@@ -111 +88 @@
 void   Analyse_Init ( float Left, float Right, SubbandFloatTyp* out, const int MaxBand );
 void   Klemm ( void );
-
-// psy_tab.c
-extern float        fftLtq   [512];             // threshold in quiet (FFT)
-extern float        partLtq  [PART_LONG];       // threshold in quiet (Partitions)
-extern float        invLtq   [PART_LONG];       // inverse threshold in quiet (Partitions, long)
-extern float        Loudness [PART_LONG];       // weighting factors for calculation of loudness
-extern float        MinVal   [PART_LONG];       // minimum quality that's adapted to the model, minval for long
-extern float        SPRD     [PART_LONG] [PART_LONG]; // tabulated spreading function
-extern float        O_MAX;
-extern float        O_MIN;
-extern float        FAC1;
-extern float        FAC2;     // constants to calculate the used offset
 
 extern const float  Butfly    [7];              // Antialiasing to calculate the subband powers