Ignore:
Timestamp:
10/07/06 02:49:28 (16 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:
1 edited

Legend:

Unmodified
Added
Removed
  • mppenc/branches/r2d/src/mppenc.h

    r66 r71  
    5757} wave_t;
    5858
    59 // ans.c
    60 // extern unsigned int  NS_Order;                          // global Flag for Noise Shaping
    61 // extern unsigned int  NS_Order_L [32];
    62 // extern unsigned int  NS_Order_R [32];                   // order of the Adaptive Noiseshaping (0: off, 1...5: on)
    63 // extern float         FIR_L     [32] [MAX_NS_ORDER];
    64 // extern float         FIR_R     [32] [MAX_NS_ORDER];     // contains FIR-Filter for NoiseShaping
    65 // extern float         ANSspec_L [MAX_ANS_LINES];
    66 // extern float         ANSspec_R [MAX_ANS_LINES];         // L/R-masking threshold for ANS
    67 // extern float         ANSspec_M [MAX_ANS_LINES];
    68 // extern float         ANSspec_S [MAX_ANS_LINES];         // M/S-masking threshold for ANS
    69 
    70 
    71 // extern Uint32_t      Buffer [BUFFER_FULL];      // buffer for bitstream file (128 KB)
    72 // extern Uint32_t      dword;                     // 32 bit-Word for Bitstream-I/O
    73 // extern unsigned int  Zaehler;                   // position counter for processed bitstream word (32 bit)
    74 // extern UintMax_t     BufferedBits;              // counter for the number of written bits in the bitstream
    75 
    7659// FIXME : put in lib header
    7760void  FlushBitstream    ( FILE* fp, const mpc_uint32_t* buffer, size_t words32bit );
     
    8164void  GetBitstreamPos   ( mpc_encoder_t*, BitstreamPos* const pos );
    8265
    83 // cvd.c
    84 int    CVD2048 ( PsyModel*, const float*, int* );
     66void   Init_FFT      ( PsyModel* );
    8567
    8668
     
    9173extern const float  tabsqrt_ex [];
    9274extern const float  tabsqrt_m  [] [2];
    93 
    94 
    95 // fft4g.c
    96 void   rdft                ( const int, float*, int*, float* );
    97 void   Generate_FFT_Tables ( const int, int*, float* );
    9875
    9976// FIXME : put in lib header
     
    11188void   Analyse_Init ( float Left, float Right, SubbandFloatTyp* out, const int MaxBand );
    11289void   Klemm ( void );
    113 
    114 // psy_tab.c
    115 extern float        fftLtq   [512];             // threshold in quiet (FFT)
    116 extern float        partLtq  [PART_LONG];       // threshold in quiet (Partitions)
    117 extern float        invLtq   [PART_LONG];       // inverse threshold in quiet (Partitions, long)
    118 extern float        Loudness [PART_LONG];       // weighting factors for calculation of loudness
    119 extern float        MinVal   [PART_LONG];       // minimum quality that's adapted to the model, minval for long
    120 extern float        SPRD     [PART_LONG] [PART_LONG]; // tabulated spreading function
    121 extern float        O_MAX;
    122 extern float        O_MIN;
    123 extern float        FAC1;
    124 extern float        FAC2;     // constants to calculate the used offset
    12590
    12691extern const float  Butfly    [7];              // Antialiasing to calculate the subband powers
Note: See TracChangeset for help on using the changeset viewer.