Changeset 203 for libmpc/branches/r2d/libmpcenc/libmpcenc.h

Timestamp:

02/08/07 14:29:39 (17 years ago)

Author:

r2d

Message:

• added sv7 to sv8 conversion utility (still work to do, but able to convert basic files)
• moved libmpcenc functions prototypes in libmpcenc.h
• removed global variables from encode_sv7 (put in mpc_encoder_t)

File:

• libmpc/branches/r2d/libmpcenc/libmpcenc.h (modified) (2 diffs)

libmpc/branches/r2d/libmpcenc/libmpcenc.h

@@ -36 +36 @@
 
 typedef struct {
-        unsigned int  L [36];
-        unsigned int  R [36];
-} SubbandQuantTyp;
-
-typedef struct {
         mpc_uint16_t    Code;        // >= 14 bit
         mpc_uint16_t    Length;      // >=  4 bit
@@ -63 +58 @@
         FILE * outputFile; // ouput file
 
-        unsigned int  MS_Channelmode;
-        unsigned int  Overflows; //       = 0;      // number of internal (filterbank) clippings
-        unsigned int MaxBand; /// number of non zero bands in last frame
+        mpc_uint32_t MS_Channelmode;
+        mpc_uint32_t Overflows; //       = 0;      // number of internal (filterbank) clippings
+        mpc_uint32_t MaxBand; /// number of non zero bands in last frame
+
+        mpc_int32_t   SCF_Index_L [32] [3];
+        mpc_int32_t   SCF_Index_R [32] [3];       // holds scalefactor-indices
+        mpc_int32_t   SCF_Last_L  [32];
+        mpc_int32_t   SCF_Last_R  [32];           // Last coded SCF value
+        mpc_quantizer Q [32];                     // holds quantized samples
+        mpc_int32_t   Res_L [32];
+        mpc_int32_t   Res_R [32];                 // holds the chosen quantizer for each subband
+        mpc_bool_t    DSCF_Flag_L [32];
+        mpc_bool_t    DSCF_Flag_R [32];           // differential SCF used?
+        mpc_bool_t    MS_Flag[32];                // MS used?
  } mpc_encoder_t;
 
+ void         Init_SV8             ( mpc_encoder_t* );
+ void writeStreamInfo ( mpc_encoder_t*e,
+                                                const unsigned int  MaxBand,
+                                                const unsigned int  MS_on,
+                                                const unsigned int  SamplesCount,
+                                                const unsigned int  SampleFreq,
+                                                const unsigned int  ChannelCount);
+ void writeEncoderInfo ( mpc_encoder_t * e,
+                                                 const float profile,
+                                                 const int PNS_on,
+                                                 const int version_major,
+                                                 const int version_minor,
+                                                 const int version_implement,
+                                                 const int version_build );
+ void writeBlock ( mpc_encoder_t * e, const char * key, const mpc_bool_t addCRC);
+ void writeMagic (mpc_encoder_t * e);
+ void writeBits (mpc_encoder_t * e, mpc_uint32_t input, unsigned int bits );
+ void writeSeekTable (mpc_encoder_t * e);
+ void writeBitstream_SV8 ( mpc_encoder_t*, int);
+