RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-05 12:07:49 +00:00
Code Issues Projects Releases Wiki Activity

simplify

Browse Source 
Originally committed as revision 8521 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-03-25 23:22:11 +00:00
parent f0cb03e9f2
commit 34a370cb0c
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/lzw.c
View File

@ -148,7 +148,7 @@ int ff_lzw_decode_init(LZWState *p, int csize, uint8_t *buf, int buf_size, int m
s->clear_code = 1 << s->codesize; s->clear_code = 1 << s->codesize;
s->end_code = s->clear_code + 1; s->end_code = s->clear_code + 1;
s->slot = s->newcodes = s->clear_code + 2; s->slot = s->newcodes = s->clear_code + 2;
s->oc = s->fc = 0; s->oc = s->fc = -1;
s->sp = s->stack; s->sp = s->stack;
s->mode = mode; s->mode = mode;
@ -203,18 +203,7 @@ int ff_lzw_decode(LZWState *p, uint8_t *buf, int len){
s->curmask = mask[s->cursize]; s->curmask = mask[s->cursize];
s->slot = s->newcodes; s->slot = s->newcodes;
s->top_slot = 1 << s->cursize; s->top_slot = 1 << s->cursize;
while ((c = lzw_get_code(s)) == s->clear_code); fc= oc= -1;
if (c == s->end_code) {
s->end_code = -1;
break;
}
/* test error */
if (c >= s->slot)
c = 0;
fc = oc = c;
*buf++ = c;
if ((--l) == 0)
break;
} else { } else {
code = c; code = c;
if (code >= s->slot) { if (code >= s->slot) {
@ -226,11 +215,12 @@ int ff_lzw_decode(LZWState *p, uint8_t *buf, int len){
code = s->prefix[code]; code = s->prefix[code];
} }
*sp++ = code; *sp++ = code;
if (s->slot < s->top_slot) { if (s->slot < s->top_slot && oc>=0) {
s->suffix[s->slot] = fc = code; s->suffix[s->slot] = code;
s->prefix[s->slot++] = oc; s->prefix[s->slot++] = oc;
oc = c;
} }
fc = code;
oc = c;
if (s->slot >= s->top_slot - s->extra_slot) { if (s->slot >= s->top_slot - s->extra_slot) {
if (s->cursize < LZW_MAXBITS) { if (s->cursize < LZW_MAXBITS) {
s->top_slot <<= 1; s->top_slot <<= 1;