annotate png.c @ 4206:be94e97ecb6e libavcodec

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