Ignore:
Timestamp:
10/27/06 18:42:05 (16 years ago)
Author:
r2d
Message:
  • added crc32
  • first sv8 encodes, main changes in bitstream.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • mppenc/branches/r2d/libmpcenc/huffsv7.c

    r76 r78  
    6262#endif
    6363
    64 static const HuffSrc_t   HuffSCFI_src [4] = {
     64static const Huffman_t   HuffSCFI_src [4] = {
    6565    { 2, 3 }, { 1, 1 }, { 3, 3 }, { 0, 2 }
    6666};
    6767
    68 static const HuffSrc_t   HuffDSCF_src [16] = {
     68static const Huffman_t   HuffDSCF_src [16] = {
    6969    { 32, 6 }, {  4, 5 }, { 17, 5 }, { 30, 5 }, { 13, 4 }, {  0, 3 }, {  3, 3 }, {  9, 4 },
    7070    {  5, 3 }, {  2, 3 }, { 14, 4 }, {  3, 4 }, { 31, 5 }, {  5, 5 }, { 33, 6 }, { 12, 4 }
    7171};
    7272
    73 static const HuffSrc_t   HuffHdr_src [10] = {
     73static const Huffman_t   HuffHdr_src [10] = {
    7474    {  92, 8 }, {  47, 7 }, {  10, 5 }, {   4, 4 }, {   0, 2 },
    7575    {   1, 1 }, {   3, 3 }, {  22, 6 }, { 187, 9 }, { 186, 9 }
    7676};
    7777
    78 static const HuffSrc_t   HuffQ1_src [2] [3*3*3] = { {
     78static const Huffman_t   HuffQ1_src [2] [3*3*3] = { {
    7979    { 54, 6 }, {  9, 5 }, { 32, 6 }, {  5, 5 }, { 10, 4 }, {  7, 5 }, { 52, 6 }, {  0, 5 }, { 35, 6 },
    8080    { 10, 5 }, {  6, 4 }, {  4, 5 }, { 11, 4 }, {  7, 3 }, { 12, 4 }, {  3, 5 }, {  7, 4 }, { 11, 5 },
     
    8686} };
    8787
    88 static const HuffSrc_t   HuffQ2_src [2] [5*5] = { {
     88static const Huffman_t   HuffQ2_src [2] [5*5] = { {
    8989    {  89,  7 }, {  47,  6 }, { 15, 5 }, {   0, 5 }, {  91,  7 },
    9090    {   4,  5 }, {   6,  4 }, { 13, 4 }, {   4, 4 }, {   5,  5 },
     
    101101
    102102#ifdef USE_SV8
    103 static const HuffSrc_t   HuffN3_src [2] [7*7] = { {
     103static const Huffman_t   HuffN3_src [2] [7*7] = { {
    104104    {  78, 7 }, {  20, 6 }, {  36, 6 }, {  51, 6 }, {  21, 6 }, { 101, 7 }, { 255, 8 },
    105105    {  37, 6 }, {   0, 5 }, {  62, 6 }, {   7, 5 }, {  60, 6 }, {  49, 6 }, { 100, 7 },
     
    120120#endif
    121121
    122 static const HuffSrc_t   HuffQ3_src [2] [ 7] = { {
     122static const Huffman_t   HuffQ3_src [2] [ 7] = { {
    123123    { 12, 4 }, { 4, 3 }, { 0, 2 }, { 1, 2 }, { 7, 3 }, { 5, 3 }, { 13, 4 }
    124124}, {
     
    126126} };
    127127
    128 static const HuffSrc_t   HuffQ4_src [2] [ 9] = { {
     128static const Huffman_t   HuffQ4_src [2] [ 9] = { {
    129129    { 5, 4 }, {  0, 3 }, { 4, 3 }, { 6, 3 }, { 7, 3 }, { 5, 3 }, {  3, 3 }, { 1, 3 }, { 4, 4 }
    130130}, {
     
    132132} };
    133133
    134 static const HuffSrc_t   HuffQ5_src [2] [15] = { {
     134static const Huffman_t   HuffQ5_src [2] [15] = { {
    135135    {  57, 6 }, { 23, 5 }, {  8, 4 }, { 10, 4 }, { 13, 4 }, {   0, 3 }, {   2, 3 }, { 3, 3 },
    136136    {   1, 3 }, { 15, 4 }, { 12, 4 }, {  9, 4 }, { 29, 5 }, {  22, 5 }, {  56, 6 }
     
    140140} };
    141141
    142 static const HuffSrc_t   HuffQ6_src [2] [31] = { {
     142static const Huffman_t   HuffQ6_src [2] [31] = { {
    143143    {   65,  7 }, {    6,  6 }, {  44,  6 }, {  45, 6 }, {   59,  6 }, {   13,  5 }, {   17,  5 }, { 19, 5 },
    144144    {   23,  5 }, {   21,  5 }, {  26,  5 }, {  30, 5 }, {    0,  4 }, {    2,  4 }, {    5,  4 }, {  7, 4 },
     
    152152} };
    153153
    154 static const HuffSrc_t   HuffQ7_src [2] [63] = { {
     154static const Huffman_t   HuffQ7_src [2] [63] = { {
    155155    { 103, 8 },    // 0.3338   01100111
    156156    { 153, 8 },    // 0.3766   10011001
     
    283283
    284284#ifdef USE_SV8
    285 static const HuffSrc_t   HuffN8_src [2] [127] = { {
     285static const Huffman_t   HuffN8_src [2] [127] = { {
    286286    { 2426, 13 }, { 4943, 13 }, {  787, 12 }, { 2470, 12 }, { 7270, 13 }, { 1764, 12 },
    287287    { 3632, 12 }, { 3633, 12 }, { 2486, 12 }, {  395, 11 }, {  607, 11 }, { 1242, 11 },
     
    341341 */
    342342
    343 void Make_HuffTable ( Huffman_t* dst, const HuffSrc_t* src, mpc_size_t len )
     343void Make_HuffTable ( Huffman_t* dst, const Huffman_t* src, mpc_size_t len )
    344344{
    345345        mpc_size_t  i;
Note: See TracChangeset for help on using the changeset viewer.