Changeset 66 for mppenc/branches/r2d/src/mppenc.h

Timestamp:

10/02/06 23:20:16 (18 years ago)

Author:

r2d

Message:

• mppenc compiles and runs, but output is not playing

File:

• mppenc/branches/r2d/src/mppenc.h (modified) (4 diffs)

mppenc/branches/r2d/src/mppenc.h

@@ -74 +74 @@
 // extern UintMax_t     BufferedBits;              // counter for the number of written bits in the bitstream
 
-void  FlushBitstream    ( FILE* fp, const Uint32_t* buffer, size_t words32bit );
-void  UpdateHeader      ( FILE* fp, Uint32_t Frames, Uint ValidSamples );
-void  WriteBits         ( const Uint32_t input, const unsigned int bits );
-void  WriteBitsAt       ( const Uint32_t input, const unsigned int bits, const BitstreamPos pos );
-void  GetBitstreamPos   ( BitstreamPos* const pos );
+// FIXME : put in lib header
+void  FlushBitstream    ( FILE* fp, const mpc_uint32_t* buffer, size_t words32bit );
+void  UpdateHeader      ( FILE* fp, mpc_uint32_t Frames, Uint ValidSamples );
+void  WriteBits         ( mpc_encoder_t*, const mpc_uint32_t input, const unsigned int bits );
+void  WriteBitsAt       ( mpc_encoder_t*, const mpc_uint32_t input, const unsigned int bits, const BitstreamPos pos );
+void  GetBitstreamPos   ( mpc_encoder_t*, BitstreamPos* const pos );
 
 // cvd.c
-int    CVD2048 ( const float*, int* );
+int    CVD2048 ( PsyModel*, const float*, int* );
 
 
@@ -140 +141 @@
 float  ISNR_Schaetzer                  ( const float* samples, const float comp, const int res);
 float  ISNR_Schaetzer_Trans            ( const float* samples, const float comp, const int res);
-void   QuantizeSubband                 ( unsigned int* qu_output, const float* input, const int res, float* errors );
+void   QuantizeSubband                 ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder );
 void   QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR );
 
@@ -146 +147 @@
 
 
+// FIXME : no more globals
 // encode_sv7.c
 extern unsigned char  MS_Flag     [32];                  // subband-wise mid/side flag
@@ -153 +155 @@
 extern int            SCF_Index_R [32] [3];              // Scalefactor-index for Bitstream
 
+// FIXME : put in lib header
 void         Init_SV7             ( void );
-void         WriteHeader_SV7      ( const unsigned int, const unsigned int, const unsigned int, const Uint32_t TotalFrames, const unsigned int SamplesRest, const unsigned int StreamVersion, const unsigned int SampleFreq );
-void         WriteBitstream_SV7   ( const int, const SubbandQuantTyp* );
-void         FinishBitstream      ( void );
+void         WriteHeader_SV7      ( mpc_encoder_t*, const unsigned int, const unsigned int, const unsigned int, const Uint32_t TotalFrames, const unsigned int SamplesRest, const unsigned int StreamVersion, const unsigned int SampleFreq );
+void         WriteBitstream_SV7   ( mpc_encoder_t*, const int, const SubbandQuantTyp* );
+void         FinishBitstream      ( mpc_encoder_t* );