Mercurial > libavformat.hg
annotate png.c @ 687:561f27e36bc4 libavformat
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
author | michael |
---|---|
date | Mon, 28 Feb 2005 02:51:53 +0000 |
parents | af07cbf4f24a |
children | da1d5db0ce5c |
rev | line source |
---|---|
44 | 1 /* |
2 * PNG image format | |
3 * Copyright (c) 2003 Fabrice Bellard. | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 */ | |
19 #include "avformat.h" | |
20 | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
21 /* TODO: |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
22 * - add 2, 4 and 16 bit depth support |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
23 * - use filters when generating a png (better compression) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
24 */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
25 |
71 | 26 #ifdef CONFIG_ZLIB |
55 | 27 #include <zlib.h> |
28 | |
29 //#define DEBUG | |
30 | |
31 #define PNG_COLOR_MASK_PALETTE 1 | |
32 #define PNG_COLOR_MASK_COLOR 2 | |
33 #define PNG_COLOR_MASK_ALPHA 4 | |
34 | |
35 #define PNG_COLOR_TYPE_GRAY 0 | |
36 #define PNG_COLOR_TYPE_PALETTE (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE) | |
37 #define PNG_COLOR_TYPE_RGB (PNG_COLOR_MASK_COLOR) | |
38 #define PNG_COLOR_TYPE_RGB_ALPHA (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA) | |
39 #define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA) | |
40 | |
41 #define PNG_FILTER_VALUE_NONE 0 | |
42 #define PNG_FILTER_VALUE_SUB 1 | |
43 #define PNG_FILTER_VALUE_UP 2 | |
44 #define PNG_FILTER_VALUE_AVG 3 | |
45 #define PNG_FILTER_VALUE_PAETH 4 | |
46 | |
47 #define PNG_IHDR 0x0001 | |
48 #define PNG_IDAT 0x0002 | |
49 #define PNG_ALLIMAGE 0x0004 | |
59 | 50 #define PNG_PLTE 0x0008 |
44 | 51 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
52 #define NB_PASSES 7 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
53 |
55 | 54 #define IOBUF_SIZE 4096 |
55 | |
56 typedef struct PNGDecodeState { | |
57 int state; | |
58 int width, height; | |
59 int bit_depth; | |
60 int color_type; | |
61 int compression_type; | |
62 int interlace_type; | |
63 int filter_type; | |
64 int channels; | |
65 int bits_per_pixel; | |
66 int bpp; | |
67 | |
68 uint8_t *image_buf; | |
69 int image_linesize; | |
59 | 70 uint32_t palette[256]; |
55 | 71 uint8_t *crow_buf; |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
72 uint8_t *last_row; |
111 | 73 uint8_t *tmp_row; |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
74 int pass; |
55 | 75 int crow_size; /* compressed row size (include filter type) */ |
76 int row_size; /* decompressed row size */ | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
77 int pass_row_size; /* decompress row size of the current pass */ |
55 | 78 int y; |
79 z_stream zstream; | |
80 } PNGDecodeState; | |
81 | |
59 | 82 static const uint8_t pngsig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; |
44 | 83 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
84 /* Mask to determine which y pixels are valid in a pass */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
85 static const uint8_t png_pass_ymask[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
86 0x80, 0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
87 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
88 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
89 /* Mask to determine which y pixels can be written in a pass */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
90 static const uint8_t png_pass_dsp_ymask[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
91 0xff, 0xff, 0x0f, 0xcc, 0x33, 0xff, 0x55, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
92 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
93 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
94 /* minimum x value */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
95 static const uint8_t png_pass_xmin[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
96 0, 4, 0, 2, 0, 1, 0 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
97 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
98 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
99 /* x shift to get row width */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
100 static const uint8_t png_pass_xshift[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
101 3, 3, 2, 2, 1, 1, 0 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
102 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
103 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
104 /* Mask to determine which pixels are valid in a pass */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
105 static const uint8_t png_pass_mask[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
106 0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
107 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
108 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
109 /* Mask to determine which pixels to overwrite while displaying */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
110 static const uint8_t png_pass_dsp_mask[NB_PASSES] = { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
111 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
112 }; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
113 |
44 | 114 static int png_probe(AVProbeData *pd) |
115 { | |
116 if (pd->buf_size >= 8 && | |
55 | 117 memcmp(pd->buf, pngsig, 8) == 0) |
44 | 118 return AVPROBE_SCORE_MAX; |
119 else | |
120 return 0; | |
121 } | |
122 | |
59 | 123 static void *png_zalloc(void *opaque, unsigned int items, unsigned int size) |
44 | 124 { |
55 | 125 return av_malloc(items * size); |
44 | 126 } |
127 | |
59 | 128 static void png_zfree(void *opaque, void *ptr) |
44 | 129 { |
55 | 130 av_free(ptr); |
44 | 131 } |
132 | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
133 static int png_get_nb_channels(int color_type) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
134 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
135 int channels; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
136 channels = 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
137 if ((color_type & (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)) == |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
138 PNG_COLOR_MASK_COLOR) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
139 channels = 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
140 if (color_type & PNG_COLOR_MASK_ALPHA) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
141 channels++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
142 return channels; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
143 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
144 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
145 /* compute the row size of an interleaved pass */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
146 static int png_pass_row_size(int pass, int bits_per_pixel, int width) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
147 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
148 int shift, xmin, pass_width; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
149 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
150 xmin = png_pass_xmin[pass]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
151 if (width <= xmin) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
152 return 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
153 shift = png_pass_xshift[pass]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
154 pass_width = (width - xmin + (1 << shift) - 1) >> shift; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
155 return (pass_width * bits_per_pixel + 7) >> 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
156 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
157 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
158 /* NOTE: we try to construct a good looking image at each pass. width |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
159 is the original image width. We also do pixel format convertion at |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
160 this stage */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
161 static void png_put_interlaced_row(uint8_t *dst, int width, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
162 int bits_per_pixel, int pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
163 int color_type, const uint8_t *src) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
164 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
165 int x, mask, dsp_mask, j, src_x, b, bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
166 uint8_t *d; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
167 const uint8_t *s; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
168 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
169 mask = png_pass_mask[pass]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
170 dsp_mask = png_pass_dsp_mask[pass]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
171 switch(bits_per_pixel) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
172 case 1: |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
173 /* we must intialize the line to zero before writing to it */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
174 if (pass == 0) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
175 memset(dst, 0, (width + 7) >> 3); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
176 src_x = 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
177 for(x = 0; x < width; x++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
178 j = (x & 7); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
179 if ((dsp_mask << j) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
180 b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
181 dst[x >> 3] |= b << (7 - j); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
182 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
183 if ((mask << j) & 0x80) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
184 src_x++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
185 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
186 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
187 default: |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
188 bpp = bits_per_pixel >> 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
189 d = dst; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
190 s = src; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
191 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
192 for(x = 0; x < width; x++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
193 j = x & 7; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
194 if ((dsp_mask << j) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
195 *(uint32_t *)d = (s[3] << 24) | (s[0] << 16) | (s[1] << 8) | s[2]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
196 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
197 d += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
198 if ((mask << j) & 0x80) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
199 s += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
200 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
201 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
202 for(x = 0; x < width; x++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
203 j = x & 7; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
204 if ((dsp_mask << j) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
205 memcpy(d, s, bpp); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
206 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
207 d += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
208 if ((mask << j) & 0x80) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
209 s += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
210 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
211 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
212 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
213 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
214 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
215 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
216 static void png_get_interlaced_row(uint8_t *dst, int row_size, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
217 int bits_per_pixel, int pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
218 const uint8_t *src, int width) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
219 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
220 int x, mask, dst_x, j, b, bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
221 uint8_t *d; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
222 const uint8_t *s; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
223 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
224 mask = png_pass_mask[pass]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
225 switch(bits_per_pixel) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
226 case 1: |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
227 memset(dst, 0, row_size); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
228 dst_x = 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
229 for(x = 0; x < width; x++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
230 j = (x & 7); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
231 if ((mask << j) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
232 b = (src[x >> 3] >> (7 - j)) & 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
233 dst[dst_x >> 3] |= b << (7 - (dst_x & 7)); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
234 dst_x++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
235 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
236 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
237 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
238 default: |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
239 bpp = bits_per_pixel >> 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
240 d = dst; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
241 s = src; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
242 for(x = 0; x < width; x++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
243 j = x & 7; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
244 if ((mask << j) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
245 memcpy(d, s, bpp); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
246 d += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
247 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
248 s += bpp; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
249 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
250 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
251 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
252 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
253 |
55 | 254 /* XXX: optimize */ |
111 | 255 /* NOTE: 'dst' can be equal to 'last' */ |
55 | 256 static void png_filter_row(uint8_t *dst, int filter_type, |
257 uint8_t *src, uint8_t *last, int size, int bpp) | |
44 | 258 { |
55 | 259 int i, p; |
44 | 260 |
55 | 261 switch(filter_type) { |
262 case PNG_FILTER_VALUE_NONE: | |
263 memcpy(dst, src, size); | |
264 break; | |
265 case PNG_FILTER_VALUE_SUB: | |
266 for(i = 0; i < bpp; i++) { | |
267 dst[i] = src[i]; | |
268 } | |
269 for(i = bpp; i < size; i++) { | |
270 p = dst[i - bpp]; | |
271 dst[i] = p + src[i]; | |
272 } | |
273 break; | |
274 case PNG_FILTER_VALUE_UP: | |
275 for(i = 0; i < size; i++) { | |
276 p = last[i]; | |
277 dst[i] = p + src[i]; | |
278 } | |
279 break; | |
280 case PNG_FILTER_VALUE_AVG: | |
281 for(i = 0; i < bpp; i++) { | |
282 p = (last[i] >> 1); | |
283 dst[i] = p + src[i]; | |
284 } | |
285 for(i = bpp; i < size; i++) { | |
286 p = ((dst[i - bpp] + last[i]) >> 1); | |
287 dst[i] = p + src[i]; | |
288 } | |
289 break; | |
290 case PNG_FILTER_VALUE_PAETH: | |
291 for(i = 0; i < bpp; i++) { | |
292 p = last[i]; | |
293 dst[i] = p + src[i]; | |
294 } | |
295 for(i = bpp; i < size; i++) { | |
296 int a, b, c, pa, pb, pc; | |
297 | |
298 a = dst[i - bpp]; | |
299 b = last[i]; | |
300 c = last[i - bpp]; | |
301 | |
302 p = b - c; | |
303 pc = a - c; | |
304 | |
305 pa = abs(p); | |
306 pb = abs(pc); | |
307 pc = abs(p + pc); | |
308 | |
309 if (pa <= pb && pa <= pc) | |
310 p = a; | |
311 else if (pb <= pc) | |
312 p = b; | |
313 else | |
314 p = c; | |
315 dst[i] = p + src[i]; | |
316 } | |
317 break; | |
318 } | |
44 | 319 } |
320 | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
321 static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
322 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
323 uint8_t *d; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
324 int j; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
325 unsigned int v; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
326 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
327 d = dst; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
328 for(j = 0; j < width; j++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
329 v = ((uint32_t *)src)[j]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
330 d[0] = v >> 16; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
331 d[1] = v >> 8; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
332 d[2] = v; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
333 d[3] = v >> 24; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
334 d += 4; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
335 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
336 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
337 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
338 static void convert_to_rgba32(uint8_t *dst, const uint8_t *src, int width) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
339 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
340 int j; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
341 unsigned int r, g, b, a; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
342 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
343 for(j = 0;j < width; j++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
344 r = src[0]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
345 g = src[1]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
346 b = src[2]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
347 a = src[3]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
348 *(uint32_t *)dst = (a << 24) | (r << 16) | (g << 8) | b; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
349 dst += 4; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
350 src += 4; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
351 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
352 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
353 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
354 /* process exactly one decompressed row */ |
55 | 355 static void png_handle_row(PNGDecodeState *s) |
44 | 356 { |
55 | 357 uint8_t *ptr, *last_row; |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
358 int got_line; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
359 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
360 if (!s->interlace_type) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
361 ptr = s->image_buf + s->image_linesize * s->y; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
362 /* need to swap bytes correctly for RGB_ALPHA */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
363 if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
364 png_filter_row(s->tmp_row, s->crow_buf[0], s->crow_buf + 1, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
365 s->last_row, s->row_size, s->bpp); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
366 memcpy(s->last_row, s->tmp_row, s->row_size); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
367 convert_to_rgba32(ptr, s->tmp_row, s->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
368 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
369 /* in normal case, we avoid one copy */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
370 if (s->y == 0) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
371 last_row = s->last_row; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
372 else |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
373 last_row = ptr - s->image_linesize; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
374 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
375 png_filter_row(ptr, s->crow_buf[0], s->crow_buf + 1, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
376 last_row, s->row_size, s->bpp); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
377 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
378 s->y++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
379 if (s->y == s->height) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
380 s->state |= PNG_ALLIMAGE; |
111 | 381 } |
382 } else { | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
383 got_line = 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
384 for(;;) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
385 ptr = s->image_buf + s->image_linesize * s->y; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
386 if ((png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
387 /* if we already read one row, it is time to stop to |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
388 wait for the next one */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
389 if (got_line) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
390 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
391 png_filter_row(s->tmp_row, s->crow_buf[0], s->crow_buf + 1, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
392 s->last_row, s->pass_row_size, s->bpp); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
393 memcpy(s->last_row, s->tmp_row, s->pass_row_size); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
394 got_line = 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
395 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
396 if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
397 /* NOTE: rgba32 is handled directly in png_put_interlaced_row */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
398 png_put_interlaced_row(ptr, s->width, s->bits_per_pixel, s->pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
399 s->color_type, s->last_row); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
400 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
401 s->y++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
402 if (s->y == s->height) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
403 for(;;) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
404 if (s->pass == NB_PASSES - 1) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
405 s->state |= PNG_ALLIMAGE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
406 goto the_end; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
407 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
408 s->pass++; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
409 s->y = 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
410 s->pass_row_size = png_pass_row_size(s->pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
411 s->bits_per_pixel, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
412 s->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
413 s->crow_size = s->pass_row_size + 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
414 if (s->pass_row_size != 0) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
415 break; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
416 /* skip pass if empty row */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
417 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
418 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
419 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
420 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
421 the_end: ; |
111 | 422 } |
44 | 423 } |
424 | |
55 | 425 static int png_decode_idat(PNGDecodeState *s, ByteIOContext *f, int length) |
44 | 426 { |
55 | 427 uint8_t buf[IOBUF_SIZE]; |
428 int buf_size; | |
44 | 429 int ret; |
55 | 430 while (length > 0) { |
431 /* read the buffer */ | |
432 buf_size = IOBUF_SIZE; | |
433 if (buf_size > length) | |
434 buf_size = length; | |
435 ret = get_buffer(f, buf, buf_size); | |
436 if (ret != buf_size) | |
437 return -1; | |
438 s->zstream.avail_in = buf_size; | |
439 s->zstream.next_in = buf; | |
440 /* decode one line if possible */ | |
441 while (s->zstream.avail_in > 0) { | |
442 ret = inflate(&s->zstream, Z_PARTIAL_FLUSH); | |
443 if (ret != Z_OK && ret != Z_STREAM_END) { | |
444 return -1; | |
445 } | |
446 if (s->zstream.avail_out == 0) { | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
447 if (!(s->state & PNG_ALLIMAGE)) { |
55 | 448 png_handle_row(s); |
449 } | |
450 s->zstream.avail_out = s->crow_size; | |
451 s->zstream.next_out = s->crow_buf; | |
452 } | |
453 } | |
454 length -= buf_size; | |
455 } | |
456 return 0; | |
44 | 457 } |
458 | |
459 static int png_read(ByteIOContext *f, | |
460 int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) | |
461 { | |
462 AVImageInfo info1, *info = &info1; | |
55 | 463 PNGDecodeState s1, *s = &s1; |
464 uint32_t tag, length; | |
465 int ret, crc; | |
466 uint8_t buf[8]; | |
44 | 467 |
55 | 468 /* check signature */ |
469 ret = get_buffer(f, buf, 8); | |
470 if (ret != 8) | |
471 return -1; | |
472 if (memcmp(buf, pngsig, 8) != 0) | |
473 return -1; | |
474 memset(s, 0, sizeof(PNGDecodeState)); | |
475 /* init the zlib */ | |
476 s->zstream.zalloc = png_zalloc; | |
477 s->zstream.zfree = png_zfree; | |
478 s->zstream.opaque = NULL; | |
479 ret = inflateInit(&s->zstream); | |
480 if (ret != Z_OK) | |
481 return -1; | |
482 for(;;) { | |
483 if (url_feof(f)) | |
484 goto fail; | |
485 length = get_be32(f); | |
486 if (length > 0x7fffffff) | |
487 goto fail; | |
488 tag = get_le32(f); | |
489 #ifdef DEBUG | |
490 printf("png: tag=%c%c%c%c length=%u\n", | |
491 (tag & 0xff), | |
492 ((tag >> 8) & 0xff), | |
493 ((tag >> 16) & 0xff), | |
494 ((tag >> 24) & 0xff), length); | |
495 #endif | |
496 switch(tag) { | |
497 case MKTAG('I', 'H', 'D', 'R'): | |
498 if (length != 13) | |
499 goto fail; | |
500 s->width = get_be32(f); | |
501 s->height = get_be32(f); | |
502 s->bit_depth = get_byte(f); | |
503 s->color_type = get_byte(f); | |
504 s->compression_type = get_byte(f); | |
505 s->filter_type = get_byte(f); | |
506 s->interlace_type = get_byte(f); | |
507 crc = get_be32(f); | |
508 s->state |= PNG_IHDR; | |
509 #ifdef DEBUG | |
510 printf("width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n", | |
511 s->width, s->height, s->bit_depth, s->color_type, | |
512 s->compression_type, s->filter_type, s->interlace_type); | |
513 #endif | |
514 break; | |
515 case MKTAG('I', 'D', 'A', 'T'): | |
516 if (!(s->state & PNG_IHDR)) | |
517 goto fail; | |
518 if (!(s->state & PNG_IDAT)) { | |
519 /* init image info */ | |
520 info->width = s->width; | |
521 info->height = s->height; | |
115 | 522 info->interleaved = (s->interlace_type != 0); |
44 | 523 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
524 s->channels = png_get_nb_channels(s->color_type); |
55 | 525 s->bits_per_pixel = s->bit_depth * s->channels; |
526 s->bpp = (s->bits_per_pixel + 7) >> 3; | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
527 s->row_size = (info->width * s->bits_per_pixel + 7) >> 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
528 |
55 | 529 if (s->bit_depth == 8 && |
530 s->color_type == PNG_COLOR_TYPE_RGB) { | |
531 info->pix_fmt = PIX_FMT_RGB24; | |
532 } else if (s->bit_depth == 8 && | |
111 | 533 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { |
534 info->pix_fmt = PIX_FMT_RGBA32; | |
535 } else if (s->bit_depth == 8 && | |
55 | 536 s->color_type == PNG_COLOR_TYPE_GRAY) { |
537 info->pix_fmt = PIX_FMT_GRAY8; | |
538 } else if (s->bit_depth == 1 && | |
539 s->color_type == PNG_COLOR_TYPE_GRAY) { | |
540 info->pix_fmt = PIX_FMT_MONOBLACK; | |
59 | 541 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) { |
542 info->pix_fmt = PIX_FMT_PAL8; | |
55 | 543 } else { |
544 goto fail; | |
545 } | |
546 ret = alloc_cb(opaque, info); | |
547 if (ret) | |
548 goto the_end; | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
549 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
550 /* compute the compressed row size */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
551 if (!s->interlace_type) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
552 s->crow_size = s->row_size + 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
553 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
554 s->pass = 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
555 s->pass_row_size = png_pass_row_size(s->pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
556 s->bits_per_pixel, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
557 s->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
558 s->crow_size = s->pass_row_size + 1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
559 } |
55 | 560 #ifdef DEBUG |
561 printf("row_size=%d crow_size =%d\n", | |
562 s->row_size, s->crow_size); | |
563 #endif | |
564 s->image_buf = info->pict.data[0]; | |
565 s->image_linesize = info->pict.linesize[0]; | |
59 | 566 /* copy the palette if needed */ |
567 if (s->color_type == PNG_COLOR_TYPE_PALETTE) | |
568 memcpy(info->pict.data[1], s->palette, 256 * sizeof(uint32_t)); | |
55 | 569 /* empty row is used if differencing to the first row */ |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
570 s->last_row = av_mallocz(s->row_size); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
571 if (!s->last_row) |
55 | 572 goto fail; |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
573 if (s->interlace_type || |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
574 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { |
111 | 575 s->tmp_row = av_malloc(s->row_size); |
576 if (!s->tmp_row) | |
577 goto fail; | |
578 } | |
55 | 579 /* compressed row */ |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
580 s->crow_buf = av_malloc(s->row_size + 1); |
55 | 581 if (!s->crow_buf) |
582 goto fail; | |
583 s->zstream.avail_out = s->crow_size; | |
584 s->zstream.next_out = s->crow_buf; | |
585 } | |
586 s->state |= PNG_IDAT; | |
587 if (png_decode_idat(s, f, length) < 0) | |
588 goto fail; | |
589 /* skip crc */ | |
590 crc = get_be32(f); | |
591 break; | |
59 | 592 case MKTAG('P', 'L', 'T', 'E'): |
593 { | |
594 int n, i, r, g, b; | |
595 | |
596 if ((length % 3) != 0 || length > 256 * 3) | |
597 goto skip_tag; | |
598 /* read the palette */ | |
599 n = length / 3; | |
600 for(i=0;i<n;i++) { | |
601 r = get_byte(f); | |
602 g = get_byte(f); | |
603 b = get_byte(f); | |
604 s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b; | |
605 } | |
606 for(;i<256;i++) { | |
607 s->palette[i] = (0xff << 24); | |
608 } | |
609 s->state |= PNG_PLTE; | |
610 crc = get_be32(f); | |
611 } | |
612 break; | |
613 case MKTAG('t', 'R', 'N', 'S'): | |
614 { | |
615 int v, i; | |
616 | |
617 /* read the transparency. XXX: Only palette mode supported */ | |
618 if (s->color_type != PNG_COLOR_TYPE_PALETTE || | |
619 length > 256 || | |
620 !(s->state & PNG_PLTE)) | |
621 goto skip_tag; | |
622 for(i=0;i<length;i++) { | |
623 v = get_byte(f); | |
624 s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); | |
625 } | |
626 crc = get_be32(f); | |
627 } | |
628 break; | |
55 | 629 case MKTAG('I', 'E', 'N', 'D'): |
630 if (!(s->state & PNG_ALLIMAGE)) | |
631 goto fail; | |
632 crc = get_be32(f); | |
633 goto exit_loop; | |
634 default: | |
635 /* skip tag */ | |
59 | 636 skip_tag: |
55 | 637 url_fskip(f, length + 4); |
638 break; | |
639 } | |
44 | 640 } |
55 | 641 exit_loop: |
642 ret = 0; | |
643 the_end: | |
644 inflateEnd(&s->zstream); | |
645 av_free(s->crow_buf); | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
646 av_free(s->last_row); |
111 | 647 av_free(s->tmp_row); |
55 | 648 return ret; |
649 fail: | |
650 ret = -1; | |
651 goto the_end; | |
44 | 652 } |
653 | |
55 | 654 static void png_write_chunk(ByteIOContext *f, uint32_t tag, |
655 const uint8_t *buf, int length) | |
44 | 656 { |
55 | 657 uint32_t crc; |
658 uint8_t tagbuf[4]; | |
659 | |
660 put_be32(f, length); | |
661 crc = crc32(0, Z_NULL, 0); | |
662 tagbuf[0] = tag; | |
663 tagbuf[1] = tag >> 8; | |
664 tagbuf[2] = tag >> 16; | |
665 tagbuf[3] = tag >> 24; | |
666 crc = crc32(crc, tagbuf, 4); | |
667 put_le32(f, tag); | |
668 if (length > 0) { | |
669 crc = crc32(crc, buf, length); | |
670 put_buffer(f, buf, length); | |
671 } | |
672 put_be32(f, crc); | |
44 | 673 } |
674 | |
55 | 675 /* XXX: use avcodec generic function ? */ |
676 static void to_be32(uint8_t *p, uint32_t v) | |
44 | 677 { |
55 | 678 p[0] = v >> 24; |
679 p[1] = v >> 16; | |
680 p[2] = v >> 8; | |
681 p[3] = v; | |
682 } | |
683 | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
684 typedef struct PNGEncodeState { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
685 ByteIOContext *f; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
686 z_stream zstream; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
687 uint8_t buf[IOBUF_SIZE]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
688 } PNGEncodeState; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
689 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
690 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
691 /* XXX: do filtering */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
692 static int png_write_row(PNGEncodeState *s, const uint8_t *data, int size) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
693 { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
694 int ret; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
695 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
696 s->zstream.avail_in = size; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
697 s->zstream.next_in = (uint8_t *)data; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
698 while (s->zstream.avail_in > 0) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
699 ret = deflate(&s->zstream, Z_NO_FLUSH); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
700 if (ret != Z_OK) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
701 return -1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
702 if (s->zstream.avail_out == 0) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
703 png_write_chunk(s->f, MKTAG('I', 'D', 'A', 'T'), s->buf, IOBUF_SIZE); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
704 s->zstream.avail_out = IOBUF_SIZE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
705 s->zstream.next_out = s->buf; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
706 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
707 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
708 return 0; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
709 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
710 |
55 | 711 static int png_write(ByteIOContext *f, AVImageInfo *info) |
712 { | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
713 PNGEncodeState s1, *s = &s1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
714 int bit_depth, color_type, y, len, row_size, ret, is_progressive; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
715 int bits_per_pixel, pass_row_size; |
44 | 716 uint8_t *ptr; |
55 | 717 uint8_t *crow_buf = NULL; |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
718 uint8_t *tmp_buf = NULL; |
44 | 719 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
720 s->f = f; |
115 | 721 is_progressive = info->interleaved; |
44 | 722 switch(info->pix_fmt) { |
111 | 723 case PIX_FMT_RGBA32: |
724 bit_depth = 8; | |
725 color_type = PNG_COLOR_TYPE_RGB_ALPHA; | |
726 break; | |
44 | 727 case PIX_FMT_RGB24: |
55 | 728 bit_depth = 8; |
729 color_type = PNG_COLOR_TYPE_RGB; | |
44 | 730 break; |
731 case PIX_FMT_GRAY8: | |
55 | 732 bit_depth = 8; |
733 color_type = PNG_COLOR_TYPE_GRAY; | |
44 | 734 break; |
735 case PIX_FMT_MONOBLACK: | |
55 | 736 bit_depth = 1; |
737 color_type = PNG_COLOR_TYPE_GRAY; | |
44 | 738 break; |
59 | 739 case PIX_FMT_PAL8: |
740 bit_depth = 8; | |
741 color_type = PNG_COLOR_TYPE_PALETTE; | |
742 break; | |
44 | 743 default: |
744 return -1; | |
745 } | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
746 bits_per_pixel = png_get_nb_channels(color_type) * bit_depth; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
747 row_size = (info->width * bits_per_pixel + 7) >> 3; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
748 |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
749 s->zstream.zalloc = png_zalloc; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
750 s->zstream.zfree = png_zfree; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
751 s->zstream.opaque = NULL; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
752 ret = deflateInit2(&s->zstream, Z_DEFAULT_COMPRESSION, |
55 | 753 Z_DEFLATED, 15, 8, Z_DEFAULT_STRATEGY); |
754 if (ret != Z_OK) | |
755 return -1; | |
756 crow_buf = av_malloc(row_size + 1); | |
757 if (!crow_buf) | |
758 goto fail; | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
759 if (is_progressive) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
760 tmp_buf = av_malloc(row_size + 1); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
761 if (!tmp_buf) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
762 goto fail; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
763 } |
55 | 764 |
765 /* write png header */ | |
766 put_buffer(f, pngsig, 8); | |
767 | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
768 to_be32(s->buf, info->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
769 to_be32(s->buf + 4, info->height); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
770 s->buf[8] = bit_depth; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
771 s->buf[9] = color_type; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
772 s->buf[10] = 0; /* compression type */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
773 s->buf[11] = 0; /* filter type */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
774 s->buf[12] = is_progressive; /* interlace type */ |
55 | 775 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
776 png_write_chunk(f, MKTAG('I', 'H', 'D', 'R'), s->buf, 13); |
44 | 777 |
59 | 778 /* put the palette if needed */ |
779 if (color_type == PNG_COLOR_TYPE_PALETTE) { | |
780 int has_alpha, alpha, i; | |
781 unsigned int v; | |
782 uint32_t *palette; | |
783 uint8_t *alpha_ptr; | |
784 | |
785 palette = (uint32_t *)info->pict.data[1]; | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
786 ptr = s->buf; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
787 alpha_ptr = s->buf + 256 * 3; |
59 | 788 has_alpha = 0; |
789 for(i = 0; i < 256; i++) { | |
790 v = palette[i]; | |
791 alpha = v >> 24; | |
792 if (alpha != 0xff) | |
793 has_alpha = 1; | |
794 *alpha_ptr++ = alpha; | |
795 ptr[0] = v >> 16; | |
796 ptr[1] = v >> 8; | |
797 ptr[2] = v; | |
798 ptr += 3; | |
799 } | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
800 png_write_chunk(f, MKTAG('P', 'L', 'T', 'E'), s->buf, 256 * 3); |
59 | 801 if (has_alpha) { |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
802 png_write_chunk(f, MKTAG('t', 'R', 'N', 'S'), s->buf + 256 * 3, 256); |
59 | 803 } |
804 } | |
805 | |
55 | 806 /* now put each row */ |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
807 s->zstream.avail_out = IOBUF_SIZE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
808 s->zstream.next_out = s->buf; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
809 if (is_progressive) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
810 uint8_t *ptr1; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
811 int pass; |
111 | 812 |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
813 for(pass = 0; pass < NB_PASSES; pass++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
814 /* NOTE: a pass is completely omited if no pixels would be |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
815 output */ |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
816 pass_row_size = png_pass_row_size(pass, bits_per_pixel, info->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
817 if (pass_row_size > 0) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
818 for(y = 0; y < info->height; y++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
819 if ((png_pass_ymask[pass] << (y & 7)) & 0x80) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
820 ptr = info->pict.data[0] + y * info->pict.linesize[0]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
821 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
822 convert_from_rgba32(tmp_buf, ptr, info->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
823 ptr1 = tmp_buf; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
824 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
825 ptr1 = ptr; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
826 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
827 png_get_interlaced_row(crow_buf + 1, pass_row_size, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
828 bits_per_pixel, pass, |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
829 ptr1, info->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
830 crow_buf[0] = PNG_FILTER_VALUE_NONE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
831 png_write_row(s, crow_buf, pass_row_size + 1); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
832 } |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
833 } |
111 | 834 } |
835 } | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
836 } else { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
837 for(y = 0; y < info->height; y++) { |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
838 ptr = info->pict.data[0] + y * info->pict.linesize[0]; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
839 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
840 convert_from_rgba32(crow_buf + 1, ptr, info->width); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
841 else |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
842 memcpy(crow_buf + 1, ptr, row_size); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
843 crow_buf[0] = PNG_FILTER_VALUE_NONE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
844 png_write_row(s, crow_buf, row_size + 1); |
55 | 845 } |
44 | 846 } |
55 | 847 /* compress last bytes */ |
848 for(;;) { | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
849 ret = deflate(&s->zstream, Z_FINISH); |
55 | 850 if (ret == Z_OK || ret == Z_STREAM_END) { |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
851 len = IOBUF_SIZE - s->zstream.avail_out; |
55 | 852 if (len > 0) { |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
853 png_write_chunk(f, MKTAG('I', 'D', 'A', 'T'), s->buf, len); |
55 | 854 } |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
855 s->zstream.avail_out = IOBUF_SIZE; |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
856 s->zstream.next_out = s->buf; |
55 | 857 if (ret == Z_STREAM_END) |
858 break; | |
859 } else { | |
860 goto fail; | |
861 } | |
862 } | |
863 png_write_chunk(f, MKTAG('I', 'E', 'N', 'D'), NULL, 0); | |
864 | |
865 put_flush_packet(f); | |
866 ret = 0; | |
867 the_end: | |
868 av_free(crow_buf); | |
113
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
869 av_free(tmp_buf); |
ff802c67fda9
added progressive PNG support (both reading and writing)
bellard
parents:
111
diff
changeset
|
870 deflateEnd(&s->zstream); |
55 | 871 return ret; |
872 fail: | |
873 ret = -1; | |
874 goto the_end; | |
44 | 875 } |
876 | |
877 AVImageFormat png_image_format = { | |
878 "png", | |
879 "png", | |
880 png_probe, | |
881 png_read, | |
111 | 882 (1 << PIX_FMT_RGBA32) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_GRAY8) | |
883 (1 << PIX_FMT_MONOBLACK) | (1 << PIX_FMT_PAL8), | |
44 | 884 png_write, |
115 | 885 AVIMAGE_INTERLEAVED, |
44 | 886 }; |
71 | 887 #endif |