Changeset 78 for mppenc/branches/r2d/libmpcenc/huffsv7.c

Timestamp:

10/27/06 18:42:05 (18 years ago)

Author:

r2d

Message:

• added crc32
• first sv8 encodes, main changes in bitstream.c

File:

• mppenc/branches/r2d/libmpcenc/huffsv7.c (modified) (10 diffs)

mppenc/branches/r2d/libmpcenc/huffsv7.c

@@ -62 +62 @@
 #endif
 
-static const HuffSrc_t   HuffSCFI_src [4] = {
+static const Huffman_t   HuffSCFI_src [4] = {
     { 2, 3 }, { 1, 1 }, { 3, 3 }, { 0, 2 }
 };
 
-static const HuffSrc_t   HuffDSCF_src [16] = {
+static const Huffman_t   HuffDSCF_src [16] = {
     { 32, 6 }, {  4, 5 }, { 17, 5 }, { 30, 5 }, { 13, 4 }, {  0, 3 }, {  3, 3 }, {  9, 4 },
     {  5, 3 }, {  2, 3 }, { 14, 4 }, {  3, 4 }, { 31, 5 }, {  5, 5 }, { 33, 6 }, { 12, 4 }
 };
 
-static const HuffSrc_t   HuffHdr_src [10] = {
+static const Huffman_t   HuffHdr_src [10] = {
     {  92, 8 }, {  47, 7 }, {  10, 5 }, {   4, 4 }, {   0, 2 },
     {   1, 1 }, {   3, 3 }, {  22, 6 }, { 187, 9 }, { 186, 9 }
 };
 
-static const HuffSrc_t   HuffQ1_src [2] [3*3*3] = { {
+static const Huffman_t   HuffQ1_src [2] [3*3*3] = { {
     { 54, 6 }, {  9, 5 }, { 32, 6 }, {  5, 5 }, { 10, 4 }, {  7, 5 }, { 52, 6 }, {  0, 5 }, { 35, 6 },
     { 10, 5 }, {  6, 4 }, {  4, 5 }, { 11, 4 }, {  7, 3 }, { 12, 4 }, {  3, 5 }, {  7, 4 }, { 11, 5 },
@@ -86 +86 @@
 } };
 
-static const HuffSrc_t   HuffQ2_src [2] [5*5] = { {
+static const Huffman_t   HuffQ2_src [2] [5*5] = { {
     {  89,  7 }, {  47,  6 }, { 15, 5 }, {   0, 5 }, {  91,  7 },
     {   4,  5 }, {   6,  4 }, { 13, 4 }, {   4, 4 }, {   5,  5 },
@@ -101 +101 @@
 
 #ifdef USE_SV8
-static const HuffSrc_t   HuffN3_src [2] [7*7] = { {
+static const Huffman_t   HuffN3_src [2] [7*7] = { {
     {  78, 7 }, {  20, 6 }, {  36, 6 }, {  51, 6 }, {  21, 6 }, { 101, 7 }, { 255, 8 },
     {  37, 6 }, {   0, 5 }, {  62, 6 }, {   7, 5 }, {  60, 6 }, {  49, 6 }, { 100, 7 },
@@ -120 +120 @@
 #endif
 
-static const HuffSrc_t   HuffQ3_src [2] [ 7] = { {
+static const Huffman_t   HuffQ3_src [2] [ 7] = { {
     { 12, 4 }, { 4, 3 }, { 0, 2 }, { 1, 2 }, { 7, 3 }, { 5, 3 }, { 13, 4 }
 }, {
@@ -126 +126 @@
 } };
 
-static const HuffSrc_t   HuffQ4_src [2] [ 9] = { {
+static const Huffman_t   HuffQ4_src [2] [ 9] = { {
     { 5, 4 }, {  0, 3 }, { 4, 3 }, { 6, 3 }, { 7, 3 }, { 5, 3 }, {  3, 3 }, { 1, 3 }, { 4, 4 }
 }, {
@@ -132 +132 @@
 } };
 
-static const HuffSrc_t   HuffQ5_src [2] [15] = { {
+static const Huffman_t   HuffQ5_src [2] [15] = { {
     {  57, 6 }, { 23, 5 }, {  8, 4 }, { 10, 4 }, { 13, 4 }, {   0, 3 }, {   2, 3 }, { 3, 3 },
     {   1, 3 }, { 15, 4 }, { 12, 4 }, {  9, 4 }, { 29, 5 }, {  22, 5 }, {  56, 6 }
@@ -140 +140 @@
 } };
 
-static const HuffSrc_t   HuffQ6_src [2] [31] = { {
+static const Huffman_t   HuffQ6_src [2] [31] = { {
     {   65,  7 }, {    6,  6 }, {  44,  6 }, {  45, 6 }, {   59,  6 }, {   13,  5 }, {   17,  5 }, { 19, 5 },
     {   23,  5 }, {   21,  5 }, {  26,  5 }, {  30, 5 }, {    0,  4 }, {    2,  4 }, {    5,  4 }, {  7, 4 },
@@ -152 +152 @@
 } };
 
-static const HuffSrc_t   HuffQ7_src [2] [63] = { {
+static const Huffman_t   HuffQ7_src [2] [63] = { {
     { 103, 8 },    // 0.3338   01100111
     { 153, 8 },    // 0.3766   10011001
@@ -283 +283 @@
 
 #ifdef USE_SV8
-static const HuffSrc_t   HuffN8_src [2] [127] = { {
+static const Huffman_t   HuffN8_src [2] [127] = { {
     { 2426, 13 }, { 4943, 13 }, {  787, 12 }, { 2470, 12 }, { 7270, 13 }, { 1764, 12 },
     { 3632, 12 }, { 3633, 12 }, { 2486, 12 }, {  395, 11 }, {  607, 11 }, { 1242, 11 },
@@ -341 +341 @@
  */
 
-void Make_HuffTable ( Huffman_t* dst, const HuffSrc_t* src, mpc_size_t len )
+void Make_HuffTable ( Huffman_t* dst, const Huffman_t* src, mpc_size_t len )
 {
         mpc_size_t  i;