comparison huffyuv.c @ 5072:1aec7fab94c4 libavcodec

use sparse huffman tables. 1.5% faster huffyuv decoding.

5071:0d503c12092b

    uint8_t *temp[3];
    uint64_t stats[3][256];
    uint8_t len[3][256];
    uint32_t bits[3][256];
    VLC vlc[6];                             //Y,U,V,YY,YU,YV
    uint16_t pix2_map[3][1<<VLC_BITS];
    AVFrame picture;
    uint8_t *bitstream_buffer;
    unsigned int bitstream_buffer_size;
    DSPContext dsp;
}HYuvContext;

    }
}
#endif /* CONFIG_ENCODERS */

static void generate_joint_tables(HYuvContext *s){
    // TODO modify init_vlc to allow sparse tables, and eliminate pix2_map
    // TODO rgb
    if(s->bitstream_bpp < 24){
        uint16_t bits[1<<VLC_BITS];
        uint8_t len[1<<VLC_BITS];
        int p, i, y, u;
        for(p=0; p<3; p++){
            for(i=y=0; y<256; y++){

                    for(u=0; u<256; u++){
                        int len1 = s->len[p][u];
                        if(len1 <= limit){
                            len[i] = len0 + len1;
                            bits[i] = (s->bits[0][y] << len1) + s->bits[p][u];
                            s->pix2_map[p][i] = (y<<8) + u;
                            i++;
                        }
                    }
                }
            }
            free_vlc(&s->vlc[3+p]);
            init_vlc(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0);
        }
    }
}

static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){

#endif /* CONFIG_ENCODERS */

/* TODO instead of restarting the read when the code isn't in the first level
 * of the joint table, jump into the 2nd level of the individual table. */
#define READ_2PIX(dst0, dst1, plane1){\
    int code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\
    if(code >= 0){\
        int x = s->pix2_map[plane1][code];\
        dst0 = x>>8;\
        dst1 = x;\
    }else{\
        dst0 = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);\
        dst1 = get_vlc2(&s->gb, s->vlc[plane1].table, VLC_BITS, 3);\
    }\
}

5072:1aec7fab94c4

    uint8_t *temp[3];
    uint64_t stats[3][256];
    uint8_t len[3][256];
    uint32_t bits[3][256];
    VLC vlc[6];                             //Y,U,V,YY,YU,YV
    AVFrame picture;
    uint8_t *bitstream_buffer;
    unsigned int bitstream_buffer_size;
    DSPContext dsp;
}HYuvContext;

    }
}
#endif /* CONFIG_ENCODERS */

static void generate_joint_tables(HYuvContext *s){
    // TODO rgb
    if(s->bitstream_bpp < 24){
        uint16_t symbols[1<<VLC_BITS];
        uint16_t bits[1<<VLC_BITS];
        uint8_t len[1<<VLC_BITS];
        int p, i, y, u;
        for(p=0; p<3; p++){
            for(i=y=0; y<256; y++){

                    for(u=0; u<256; u++){
                        int len1 = s->len[p][u];
                        if(len1 <= limit){
                            len[i] = len0 + len1;
                            bits[i] = (s->bits[0][y] << len1) + s->bits[p][u];
                            symbols[i] = (y<<8) + u;
                            if(symbols[i] != 0xffff) // reserved to mean "invalid"
                                i++;
                        }
                    }
                }
            }
            free_vlc(&s->vlc[3+p]);
            init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0);
        }
    }
}

static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){

#endif /* CONFIG_ENCODERS */

/* TODO instead of restarting the read when the code isn't in the first level
 * of the joint table, jump into the 2nd level of the individual table. */
#define READ_2PIX(dst0, dst1, plane1){\
    uint16_t code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\
    if(code != 0xffff){\
        dst0 = code>>8;\
        dst1 = code;\
    }else{\
        dst0 = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);\
        dst1 = get_vlc2(&s->gb, s->vlc[plane1].table, VLC_BITS, 3);\
    }\
}