annotate png.c @ 2535:e0bf024629cf libavcodec

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