Changeset 65 for mppenc/branches/r2d/src/mppdec.h

Timestamp:

10/02/06 20:41:38 (18 years ago)

Author:

r2d

Message:

• mppenc can be compiled *but* doesn't work (segfault)
• some variables are not initialized in the libs structs - TO BE FIXED
• I have duplicated some (one ?) variables in the libs structs and the dup variables in libmpcenc are not used (and not initialized) - TO BE FIXED

File:

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

mppenc/branches/r2d/src/mppdec.h

@@ -920 +920 @@
 extern size_t             InputCnt;             // current offset in this buffer
 
-// huffsv7.c
-extern Huffman_t          HuffHdr    [10];
-extern Huffman_t          HuffSCFI   [ 4];
-extern Huffman_t          HuffDSCF   [16];
-extern Huffman_t          HuffQ1 [2] [ 3*3*3];
-extern Huffman_t          HuffQ2 [2] [ 5*5];
-extern Huffman_t          HuffQ3 [2] [ 7];
-extern Huffman_t          HuffN3 [2] [ 7*7];
-extern Huffman_t          HuffQ4 [2] [ 9];
-extern Huffman_t          HuffQ5 [2] [15];
-extern Huffman_t          HuffQ6 [2] [31];
-extern Huffman_t          HuffQ7 [2] [63];
-extern Huffman_t          HuffN8 [2][127];
-extern const Huffman_t*   HuffQ  [2] [ 8];
-extern const Huffman_t*   HuffN  [2] [ 9];
-extern Uint8_t            LUT1_0  [1<< 6];
-extern Uint8_t            LUT1_1  [1<< 9];
-extern Uint8_t            LUT2_0  [1<< 7];
-extern Uint8_t            LUT2_1  [1<<10];
-extern Uint8_t            LUT3_0  [1<< 4];
-extern Uint8_t            LUT3_1  [1<< 5];
-extern Uint8_t            LUT4_0  [1<< 4];
-extern Uint8_t            LUT4_1  [1<< 5];
-extern Uint8_t            LUT5_0  [1<< 6];
-extern Uint8_t            LUT5_1  [1<< 8];
-extern Uint8_t            LUT6_0  [1<< 7];
-extern Uint8_t            LUT6_1  [1<< 7];
-extern Uint8_t            LUT7_0  [1<< 8];
-extern Uint8_t            LUT7_1  [1<< 8];
-extern Uint8_t            LUTDSCF [1<< 6];
-
-// huffsv46.c
-extern const Huffman_t*   Entropie      [18];
-extern const Huffman_t*   Region        [32];
-extern Huffman_t          SCFI_Bundle   [ 8];
-extern Huffman_t          DSCF_Entropie [13];
+// // huffsv7.c
+// extern Huffman_t          HuffHdr    [10];
+// extern Huffman_t          HuffSCFI   [ 4];
+// extern Huffman_t          HuffDSCF   [16];
+// extern Huffman_t          HuffQ1 [2] [ 3*3*3];
+// extern Huffman_t          HuffQ2 [2] [ 5*5];
+// extern Huffman_t          HuffQ3 [2] [ 7];
+// extern Huffman_t          HuffN3 [2] [ 7*7];
+// extern Huffman_t          HuffQ4 [2] [ 9];
+// extern Huffman_t          HuffQ5 [2] [15];
+// extern Huffman_t          HuffQ6 [2] [31];
+// extern Huffman_t          HuffQ7 [2] [63];
+// extern Huffman_t          HuffN8 [2][127];
+// extern const Huffman_t*   HuffQ  [2] [ 8];
+// extern const Huffman_t*   HuffN  [2] [ 9];
+// extern Uint8_t            LUT1_0  [1<< 6];
+// extern Uint8_t            LUT1_1  [1<< 9];
+// extern Uint8_t            LUT2_0  [1<< 7];
+// extern Uint8_t            LUT2_1  [1<<10];
+// extern Uint8_t            LUT3_0  [1<< 4];
+// extern Uint8_t            LUT3_1  [1<< 5];
+// extern Uint8_t            LUT4_0  [1<< 4];
+// extern Uint8_t            LUT4_1  [1<< 5];
+// extern Uint8_t            LUT5_0  [1<< 6];
+// extern Uint8_t            LUT5_1  [1<< 8];
+// extern Uint8_t            LUT6_0  [1<< 7];
+// extern Uint8_t            LUT6_1  [1<< 7];
+// extern Uint8_t            LUT7_0  [1<< 8];
+// extern Uint8_t            LUT7_1  [1<< 8];
+// extern Uint8_t            LUTDSCF [1<< 6];
 
 // mppdec.c
@@ -984 +978 @@
 extern Uint               Bitrate;
 extern Int                Min_Band;
-extern Int                Max_Band;
 extern Float              __Cc          [1 + 18];
 extern const Uint         __Dc          [1 + 18];
@@ -1054 +1047 @@
 
 void       Init_Dither                ( Int bits, int shapingtype, Double dither );
-void       OverdriveReport            ( void );
+// void       OverdriveReport            ( void );
 SyntheseFilter16_t
            Get_Synthese_Filter        ( void );
@@ -1062 +1055 @@
 void       Requantize_MidSideStereo   ( Int Stop_Band, const Bool_t* used_MS );
 void       Requantize_IntensityStereo ( Int Start_Band, Int Stop_Band );
-void       Resort_HuffTable           ( Huffman_t* const Table, const size_t elements, Int offset );
-void       Make_HuffTable             ( Huffman_t* dst, const HuffSrc_t* src, size_t len );
-void       Make_LookupTable           ( Uint8_t* LUT, size_t LUT_len, const Huffman_t* const Table, const size_t elements );
+// void       Resort_HuffTable           ( Huffman_t* const Table, const size_t elements, Int offset );
+// void       Make_HuffTable             ( Huffman_t* dst, const HuffSrc_t* src, size_t len );
+// void       Make_LookupTable           ( Uint8_t* LUT, size_t LUT_len, const Huffman_t* const Table, const size_t elements );
 size_t     complete_read              ( int fd, void* dest, size_t bytes );
 int        isdir                      ( const char* Name );