diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2007-05-24 17:40:02 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2007-05-24 17:40:02 +0000 |
| commit | acc0e0c8b64d0c271d6f74aa36f8d6914c305393 (patch) | |
| tree | 347154073783212789c9063d6d95e1c4e01b679d /libavcodec/huffyuv.c | |
| parent | b613bacca9c256f1483c46847f713e47a0e9a5f6 (diff) | |
| download | ffmpeg-acc0e0c8b64d0c271d6f74aa36f8d6914c305393.tar.gz | |
use sparse huffman tables. 1.5% faster huffyuv decoding.
Originally committed as revision 9118 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/huffyuv.c')
| -rw-r--r-- | libavcodec/huffyuv.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 81e9ee1207..12122c80a5 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -71,7 +71,6 @@ typedef struct HYuvContext{ 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; @@ -320,9 +319,9 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ #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 symbols[1<<VLC_BITS]; uint16_t bits[1<<VLC_BITS]; uint8_t len[1<<VLC_BITS]; int p, i, y, u; @@ -336,14 +335,15 @@ static void generate_joint_tables(HYuvContext *s){ 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++; + symbols[i] = (y<<8) + u; + if(symbols[i] != 0xffff) // reserved to mean "invalid" + i++; } } } } free_vlc(&s->vlc[3+p]); - init_vlc(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); + init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0); } } } @@ -690,11 +690,10 @@ static int encode_init(AVCodecContext *avctx) /* 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;\ + 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);\ |