diff gifdec.c @ 887:d70e50f1495f libavformat

COSMETICS: tabs --> spaces, some prettyprinting
author diego
date Thu, 22 Dec 2005 01:10:11 +0000
parents da1d5db0ce5c
children edbe5c3717f9
line wrap: on
line diff
--- a/gifdec.c	Mon Dec 19 20:49:00 2005 +0000
+++ b/gifdec.c	Thu Dec 22 01:10:11 2005 +0000
@@ -22,8 +22,8 @@
 
 //#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 @@
     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 @@
     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_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 @@
         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 @@
     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 @@
 #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 @@
     /* 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 @@
     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 @@
     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 @@
     /* 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_packet(AVFormatContext * s1,
-			   AVPacket * pkt)
+                           AVPacket * pkt)
 {
     GifState *s = s1->priv_data;
     int ret;
@@ -578,7 +578,7 @@
 
     /* 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);