Commit a2d4dfd4 authored by Michael Niedermayer's avatar Michael Niedermayer

Optimize EOB check in mjpeg decode_block() by adjusting the VLC symbol.

Originally committed as revision 25548 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e4463f21
...@@ -57,6 +57,8 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_tab ...@@ -57,6 +57,8 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_tab
for(i=0; i<256; i++) for(i=0; i<256; i++)
huff_sym[i]= i + 16*is_ac; huff_sym[i]= i + 16*is_ac;
if(is_ac) huff_sym[0]= 16*256;
return init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2, huff_sym, 2, 2, use_static); return init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2, huff_sym, 2, 2, use_static);
} }
...@@ -415,9 +417,6 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block, ...@@ -415,9 +417,6 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
UPDATE_CACHE(re, &s->gb); UPDATE_CACHE(re, &s->gb);
GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2) GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2)
/* EOB */
if (code == 0x10)
break;
i += ((unsigned)code) >> 4; i += ((unsigned)code) >> 4;
code &= 0xf; code &= 0xf;
if(code){ if(code){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment