diff options
author | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
commit | bb270c0896b39e1ae9277355e3c120ed3feb64a3 (patch) | |
tree | fc2fc2b1216d19acb3879abb6ea5a3b400f43fe4 /libavformat/gifdec.c | |
parent | 50827fcf44f34521df4708cdb633809b56fb9df3 (diff) | |
download | ffmpeg-bb270c0896b39e1ae9277355e3c120ed3feb64a3.tar.gz |
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/gifdec.c')
-rw-r--r-- | libavformat/gifdec.c | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c index 162da564e7..7ceadfd055 100644 --- a/libavformat/gifdec.c +++ b/libavformat/gifdec.c @@ -22,8 +22,8 @@ int gif_write(ByteIOContext *pb, AVImageInfo *info); //#define DEBUG -#define MAXBITS 12 -#define SIZTABLE (1<<MAXBITS) +#define MAXBITS 12 +#define SIZTABLE (1<<MAXBITS) #define GCE_DISPOSAL_NONE 0 #define GCE_DISPOSAL_INPLACE 1 @@ -54,14 +54,14 @@ typedef struct GifState { int bbits; unsigned int bbuf; - int cursize; /* The current code size */ + int cursize; /* The current code size */ int curmask; int codesize; int clear_code; int end_code; - int newcodes; /* First available code */ - int top_slot; /* Highest code for current size */ - int slot; /* Last read code */ + int newcodes; /* First available code */ + int top_slot; /* Highest code for current size */ + int slot; /* Last read code */ int fc, oc; uint8_t *sp; uint8_t stack[SIZTABLE]; @@ -97,7 +97,7 @@ static int gif_video_probe(AVProbeData * pd) int gce_flags, gce_disposal; if (pd->buf_size < 24 || - memcmp(pd->buf, gif89a_sig, 6) != 0) + memcmp(pd->buf, gif89a_sig, 6) != 0) return 0; p_end = pd->buf + pd->buf_size; p = pd->buf + 6; @@ -145,11 +145,11 @@ static int gif_video_probe(AVProbeData * pd) static int gif_image_probe(AVProbeData * pd) { if (pd->buf_size >= 24 && - (memcmp(pd->buf, gif87a_sig, 6) == 0 || - memcmp(pd->buf, gif89a_sig, 6) == 0)) - return AVPROBE_SCORE_MAX - 1; + (memcmp(pd->buf, gif87a_sig, 6) == 0 || + memcmp(pd->buf, gif89a_sig, 6) == 0)) + return AVPROBE_SCORE_MAX - 1; else - return 0; + return 0; } @@ -198,7 +198,7 @@ static inline int GetCode(GifState * s) s->bbuf |= ptr[0] << s->bbits; ptr++; s->pbuf = ptr; - s->bbits += 8; + s->bbits += 8; } c = s->bbuf & s->curmask; s->bbuf >>= s->cursize; @@ -223,61 +223,61 @@ static int GLZWDecode(GifState * s, uint8_t * buf, int len) fc = s->fc; while (sp > s->stack) { - *buf++ = *(--sp); - if ((--l) == 0) - goto the_end; + *buf++ = *(--sp); + if ((--l) == 0) + goto the_end; } for (;;) { - c = GetCode(s); - if (c == s->end_code) { - s->end_code = -1; - break; - } else if (c == s->clear_code) { - s->cursize = s->codesize + 1; - s->curmask = mask[s->cursize]; - s->slot = s->newcodes; - s->top_slot = 1 << s->cursize; - while ((c = GetCode(s)) == s->clear_code); - 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 { - code = c; - if (code >= s->slot) { - *sp++ = fc; - code = oc; - } - while (code >= s->newcodes) { - *sp++ = s->suffix[code]; - code = s->prefix[code]; - } - *sp++ = code; - if (s->slot < s->top_slot) { - s->suffix[s->slot] = fc = code; - s->prefix[s->slot++] = oc; - oc = c; - } - if (s->slot >= s->top_slot) { - if (s->cursize < MAXBITS) { - s->top_slot <<= 1; - s->curmask = mask[++s->cursize]; - } - } - while (sp > s->stack) { - *buf++ = *(--sp); - if ((--l) == 0) + c = GetCode(s); + if (c == s->end_code) { + s->end_code = -1; + break; + } else if (c == s->clear_code) { + s->cursize = s->codesize + 1; + s->curmask = mask[s->cursize]; + s->slot = s->newcodes; + s->top_slot = 1 << s->cursize; + while ((c = GetCode(s)) == s->clear_code); + 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 { + code = c; + if (code >= s->slot) { + *sp++ = fc; + code = oc; + } + while (code >= s->newcodes) { + *sp++ = s->suffix[code]; + code = s->prefix[code]; + } + *sp++ = code; + if (s->slot < s->top_slot) { + s->suffix[s->slot] = fc = code; + s->prefix[s->slot++] = oc; + oc = c; + } + if (s->slot >= s->top_slot) { + if (s->cursize < MAXBITS) { + s->top_slot <<= 1; + s->curmask = mask[++s->cursize]; + } + } + while (sp > s->stack) { + *buf++ = *(--sp); + if ((--l) == 0) goto the_end; - } - } + } + } } the_end: s->sp = sp; @@ -306,7 +306,7 @@ static int gif_read_image(GifState *s) #endif if (has_local_palette) { - get_buffer(f, s->local_palette, 3 * (1 << bits_per_pixel)); + get_buffer(f, s->local_palette, 3 * (1 << bits_per_pixel)); palette = s->local_palette; } else { palette = s->global_palette; @@ -465,10 +465,10 @@ static int gif_read_header1(GifState *s) /* read gif signature */ ret = get_buffer(f, sig, 6); if (ret != 6) - return -1; + return -1; if (memcmp(sig, gif87a_sig, 6) != 0 && - memcmp(sig, gif89a_sig, 6) != 0) - return -1; + memcmp(sig, gif89a_sig, 6) != 0) + return -1; /* read screen header */ s->transparent_color_index = -1; @@ -485,15 +485,15 @@ static int gif_read_header1(GifState *s) has_global_palette = (v & 0x80); s->bits_per_pixel = (v & 0x07) + 1; s->background_color_index = get_byte(f); - get_byte(f); /* ignored */ + get_byte(f); /* ignored */ #ifdef DEBUG printf("gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", - s->screen_width, s->screen_height, s->bits_per_pixel, - has_global_palette); + s->screen_width, s->screen_height, s->bits_per_pixel, + has_global_palette); #endif if (has_global_palette) { - n = 1 << s->bits_per_pixel; - get_buffer(f, s->global_palette, n * 3); + n = 1 << s->bits_per_pixel; + get_buffer(f, s->global_palette, n * 3); } return 0; } @@ -504,37 +504,37 @@ static int gif_parse_next_image(GifState *s) int ret, code; for (;;) { - code = url_fgetc(f); + code = url_fgetc(f); #ifdef DEBUG - printf("gif: code=%02x '%c'\n", code, code); + printf("gif: code=%02x '%c'\n", code, code); #endif - switch (code) { - case ',': - if (gif_read_image(s) < 0) - return AVERROR_IO; - ret = 0; - goto the_end; - case ';': - /* end of image */ - ret = AVERROR_IO; - goto the_end; - case '!': + switch (code) { + case ',': + if (gif_read_image(s) < 0) + return AVERROR_IO; + ret = 0; + goto the_end; + case ';': + /* end of image */ + ret = AVERROR_IO; + goto the_end; + case '!': if (gif_read_extension(s) < 0) return AVERROR_IO; - break; - case EOF: - default: - /* error or errneous EOF */ - ret = AVERROR_IO; - goto the_end; - } + break; + case EOF: + default: + /* error or errneous EOF */ + ret = AVERROR_IO; + goto the_end; + } } the_end: return ret; } static int gif_read_header(AVFormatContext * s1, - AVFormatParameters * ap) + AVFormatParameters * ap) { GifState *s = s1->priv_data; ByteIOContext *f = &s1->pb; @@ -553,7 +553,7 @@ static int gif_read_header(AVFormatContext * s1, /* now we are ready: build format streams */ st = av_new_stream(s1, 0); if (!st) - return -1; + return -1; st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO; @@ -567,7 +567,7 @@ static int gif_read_header(AVFormatContext * s1, } static int gif_read_packet(AVFormatContext * s1, - AVPacket * pkt) + AVPacket * pkt) { GifState *s = s1->priv_data; int ret; @@ -578,7 +578,7 @@ static int gif_read_packet(AVFormatContext * s1, /* XXX: avoid copying */ if (av_new_packet(pkt, s->screen_width * s->screen_height * 3)) { - return AVERROR_IO; + return AVERROR_IO; } pkt->stream_index = 0; memcpy(pkt->data, s->image_buf, s->screen_width * s->screen_height * 3); |