annotate png.c @ 1619:b95cdbfc2d16 libavformat

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