annotate gifdec.c @ 4253:b2c06cdd6154 libavcodec

remove pretty much useless skiping of some predictors this has pretty much no quality or speed effect except very small random changes
author michael
date Fri, 01 Dec 2006 20:38:54 +0000
parents dc52a253f51b
children 9bf957e669f0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
1 /*
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
2 * GIF decoder
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
3 * Copyright (c) 2003 Fabrice Bellard.
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
4 * Copyright (c) 2006 Baptiste Coudurier.
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
5 *
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
6 * This file is part of FFmpeg.
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
7 *
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
12 *
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
16 * Lesser General Public License for more details.
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
17 *
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
21 */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
22
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
23 //#define DEBUG
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
24
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
25 #include "avcodec.h"
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
26 #include "bytestream.h"
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
27 #include "lzw.h"
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
28
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
29 #define GCE_DISPOSAL_NONE 0
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
30 #define GCE_DISPOSAL_INPLACE 1
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
31 #define GCE_DISPOSAL_BACKGROUND 2
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
32 #define GCE_DISPOSAL_RESTORE 3
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
33
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
34 typedef struct GifState {
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
35 AVFrame picture;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
36 int screen_width;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
37 int screen_height;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
38 int bits_per_pixel;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
39 int background_color_index;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
40 int transparent_color_index;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
41 int color_resolution;
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
42 uint32_t *image_palette;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
43
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
44 /* after the frame is displayed, the disposal method is used */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
45 int gce_disposal;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
46 /* delay during which the frame is shown */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
47 int gce_delay;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
48
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
49 /* LZW compatible decoder */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
50 uint8_t *bytestream;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
51 LZWState *lzw;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
52
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
53 /* aux buffers */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
54 uint8_t global_palette[256 * 3];
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
55 uint8_t local_palette[256 * 3];
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
56 } GifState;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
57
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
58 static const uint8_t gif87a_sig[6] = "GIF87a";
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
59 static const uint8_t gif89a_sig[6] = "GIF89a";
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
60
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
61 static int gif_read_image(GifState *s)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
62 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
63 int left, top, width, height, bits_per_pixel, code_size, flags;
4057
ba767c63a07f remove unused variables
bcoudurier
parents: 4056
diff changeset
64 int is_interleaved, has_local_palette, y, pass, y1, linesize, n, i;
4144
dc52a253f51b remove useless line variable
bcoudurier
parents: 4143
diff changeset
65 uint8_t *ptr, *spal, *palette, *ptr1;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
66
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
67 left = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
68 top = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
69 width = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
70 height = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
71 flags = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
72 is_interleaved = flags & 0x40;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
73 has_local_palette = flags & 0x80;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
74 bits_per_pixel = (flags & 0x07) + 1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
75 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
76 dprintf("gif: image x=%d y=%d w=%d h=%d\n", left, top, width, height);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
77 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
78
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
79 if (has_local_palette) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
80 bytestream_get_buffer(&s->bytestream, s->local_palette, 3 * (1 << bits_per_pixel));
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
81 palette = s->local_palette;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
82 } else {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
83 palette = s->global_palette;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
84 bits_per_pixel = s->bits_per_pixel;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
85 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
86
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
87 /* verify that all the image is inside the screen dimensions */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
88 if (left + width > s->screen_width ||
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
89 top + height > s->screen_height)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
90 return -EINVAL;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
91
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
92 /* build the palette */
4060
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
93 n = (1 << bits_per_pixel);
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
94 spal = palette;
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
95 for(i = 0; i < n; i++) {
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
96 s->image_palette[i] = (0xff << 24) |
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
97 (spal[0] << 16) | (spal[1] << 8) | (spal[2]);
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
98 spal += 3;
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
99 }
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
100 for(; i < 256; i++)
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
101 s->image_palette[i] = (0xff << 24);
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
102 /* handle transparency */
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
103 if (s->transparent_color_index >= 0)
e46fa0f9192a indention
bcoudurier
parents: 4059
diff changeset
104 s->image_palette[s->transparent_color_index] = 0;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
105
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
106 /* now get the image data */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
107 code_size = bytestream_get_byte(&s->bytestream);
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
108 //TODO: add proper data size
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
109 ff_lzw_decode_init(s->lzw, code_size, s->bytestream, 0, FF_LZW_GIF);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
110
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
111 /* read all the image */
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
112 linesize = s->picture.linesize[0];
4143
a8e3a116b41f fix decoding position
bcoudurier
parents: 4080
diff changeset
113 ptr1 = s->picture.data[0] + top * linesize + left;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
114 ptr = ptr1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
115 pass = 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
116 y1 = 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
117 for (y = 0; y < height; y++) {
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
118 ff_lzw_decode(s->lzw, ptr, width);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
119 if (is_interleaved) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
120 switch(pass) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
121 default:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
122 case 0:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
123 case 1:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
124 y1 += 8;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
125 ptr += linesize * 8;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
126 if (y1 >= height) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
127 y1 = 4;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
128 if (pass == 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
129 ptr = ptr1 + linesize * 4;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
130 else
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
131 ptr = ptr1 + linesize * 2;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
132 pass++;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
133 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
134 break;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
135 case 2:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
136 y1 += 4;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
137 ptr += linesize * 4;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
138 if (y1 >= height) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
139 y1 = 1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
140 ptr = ptr1 + linesize;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
141 pass++;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
142 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
143 break;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
144 case 3:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
145 y1 += 2;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
146 ptr += linesize * 2;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
147 break;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
148 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
149 } else {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
150 ptr += linesize;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
151 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
152 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
153 /* read the garbage data until end marker is found */
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
154 ff_lzw_decode_tail(s->lzw);
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
155 s->bytestream = ff_lzw_cur_ptr(s->lzw);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
156 return 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
157 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
158
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
159 static int gif_read_extension(GifState *s)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
160 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
161 int ext_code, ext_len, i, gce_flags, gce_transparent_index;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
162
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
163 /* extension */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
164 ext_code = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
165 ext_len = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
166 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
167 dprintf("gif: ext_code=0x%x len=%d\n", ext_code, ext_len);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
168 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
169 switch(ext_code) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
170 case 0xf9:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
171 if (ext_len != 4)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
172 goto discard_ext;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
173 s->transparent_color_index = -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
174 gce_flags = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
175 s->gce_delay = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
176 gce_transparent_index = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
177 if (gce_flags & 0x01)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
178 s->transparent_color_index = gce_transparent_index;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
179 else
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
180 s->transparent_color_index = -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
181 s->gce_disposal = (gce_flags >> 2) & 0x7;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
182 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
183 dprintf("gif: gce_flags=%x delay=%d tcolor=%d disposal=%d\n",
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
184 gce_flags, s->gce_delay,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
185 s->transparent_color_index, s->gce_disposal);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
186 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
187 ext_len = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
188 break;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
189 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
190
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
191 /* NOTE: many extension blocks can come after */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
192 discard_ext:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
193 while (ext_len != 0) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
194 for (i = 0; i < ext_len; i++)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
195 bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
196 ext_len = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
197 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
198 dprintf("gif: ext_len1=%d\n", ext_len);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
199 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
200 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
201 return 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
202 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
203
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
204 static int gif_read_header1(GifState *s)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
205 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
206 uint8_t sig[6];
4057
ba767c63a07f remove unused variables
bcoudurier
parents: 4056
diff changeset
207 int v, n;
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
208 int has_global_palette;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
209
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
210 /* read gif signature */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
211 bytestream_get_buffer(&s->bytestream, sig, 6);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
212 if (memcmp(sig, gif87a_sig, 6) != 0 &&
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
213 memcmp(sig, gif89a_sig, 6) != 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
214 return -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
215
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
216 /* read screen header */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
217 s->transparent_color_index = -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
218 s->screen_width = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
219 s->screen_height = bytestream_get_le16(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
220 if( (unsigned)s->screen_width > 32767
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
221 || (unsigned)s->screen_height > 32767){
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
222 av_log(NULL, AV_LOG_ERROR, "picture size too large\n");
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
223 return -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
224 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
225
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
226 v = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
227 s->color_resolution = ((v & 0x70) >> 4) + 1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
228 has_global_palette = (v & 0x80);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
229 s->bits_per_pixel = (v & 0x07) + 1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
230 s->background_color_index = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
231 bytestream_get_byte(&s->bytestream); /* ignored */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
232 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
233 dprintf("gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n",
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
234 s->screen_width, s->screen_height, s->bits_per_pixel,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
235 has_global_palette);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
236 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
237 if (has_global_palette) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
238 n = 1 << s->bits_per_pixel;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
239 bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
240 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
241 return 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
242 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
243
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
244 static int gif_parse_next_image(GifState *s)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
245 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
246 int ret, code;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
247
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
248 for (;;) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
249 code = bytestream_get_byte(&s->bytestream);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
250 #ifdef DEBUG
4056
55efd8b39474 printf -> dprintf
bcoudurier
parents: 4055
diff changeset
251 dprintf("gif: code=%02x '%c'\n", code, code);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
252 #endif
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
253 switch (code) {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
254 case ',':
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
255 if (gif_read_image(s) < 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
256 return -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
257 ret = 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
258 goto the_end;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
259 case ';':
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
260 /* end of image */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
261 ret = -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
262 goto the_end;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
263 case '!':
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
264 if (gif_read_extension(s) < 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
265 return -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
266 break;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
267 case EOF:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
268 default:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
269 /* error or errneous EOF */
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
270 ret = -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
271 goto the_end;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
272 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
273 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
274 the_end:
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
275 return ret;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
276 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
277
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
278 static int gif_decode_init(AVCodecContext *avctx)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
279 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
280 GifState *s = avctx->priv_data;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
281
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
282 avcodec_get_frame_defaults(&s->picture);
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
283 avctx->coded_frame= &s->picture;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
284 s->picture.data[0] = NULL;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
285 ff_lzw_decode_open(&s->lzw);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
286 return 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
287 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
288
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
289 static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
290 {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
291 GifState *s = avctx->priv_data;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
292 AVFrame *picture = data;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
293 int ret;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
294
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
295 s->bytestream = buf;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
296 if (gif_read_header1(s) < 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
297 return -1;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
298
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
299 avctx->pix_fmt = PIX_FMT_PAL8;
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
300 if (avcodec_check_dimensions(avctx, s->screen_width, s->screen_height))
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
301 return -1;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
302 avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
303
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
304 if (s->picture.data[0])
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
305 avctx->release_buffer(avctx, &s->picture);
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
306 if (avctx->get_buffer(avctx, &s->picture) < 0) {
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
307 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
308 return -1;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
309 }
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
310 s->image_palette = (uint32_t *)s->picture.data[1];
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
311 ret = gif_parse_next_image(s);
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
312 if (ret < 0)
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
313 return ret;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
314
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
315 *picture = s->picture;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
316 *data_size = sizeof(AVPicture);
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
317 return 0;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
318 }
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
319
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
320 static int gif_decode_close(AVCodecContext *avctx)
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
321 {
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
322 GifState *s = avctx->priv_data;
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
323
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4060
diff changeset
324 ff_lzw_decode_close(&s->lzw);
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
325 if(s->picture.data[0])
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
326 avctx->release_buffer(avctx, &s->picture);
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
327 return 0;
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
328 }
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
329
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
330 AVCodec gif_decoder = {
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
331 "gif",
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
332 CODEC_TYPE_VIDEO,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
333 CODEC_ID_GIF,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
334 sizeof(GifState),
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
335 gif_decode_init,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
336 NULL,
4058
7f976c7cce97 use avctx->get_buffer
bcoudurier
parents: 4057
diff changeset
337 gif_decode_close,
4054
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
338 gif_decode_frame,
f20c7bb12103 change gif demuxer to gif decoder
bcoudurier
parents:
diff changeset
339 };