annotate png.c @ 1721:650d81b4b199 libavformat

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