annotate png.c @ 5230:2a340aea762d libavcodec

simplify ff_copy_bits: merge 2 test branches
author aurel
date Fri, 06 Jul 2007 14:14:41 +0000
parents e9a0c447dc73
children 26f4095e35d2
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"
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
22 #include "bytestream.h"
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
23
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
24 /* TODO:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
25 * - add 2, 4 and 16 bit depth support
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
26 * - use filters when generating a png (better compression)
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
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 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
91
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
92 /* 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
93 static const uint8_t png_pass_ymask[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
94 0x80, 0x80, 0x08, 0x88, 0x22, 0xaa, 0x55,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
95 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
96
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
97 /* 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
98 static const uint8_t png_pass_dsp_ymask[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
99 0xff, 0xff, 0x0f, 0xcc, 0x33, 0xff, 0x55,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
100 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
101
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
102 /* minimum x value */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
103 static const uint8_t png_pass_xmin[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
104 0, 4, 0, 2, 0, 1, 0
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
105 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
106
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
107 /* x shift to get row width */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
108 static const uint8_t png_pass_xshift[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
109 3, 3, 2, 2, 1, 1, 0
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
110 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
111
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
112 /* Mask to determine which pixels are valid in a pass */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
113 static const uint8_t png_pass_mask[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
114 0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
115 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
116
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
117 /* Mask to determine which pixels to overwrite while displaying */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
118 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
119 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff
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 #if 0
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
122 static int png_probe(AVProbeData *pd)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
123 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
124 if (pd->buf_size >= 8 &&
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
125 memcmp(pd->buf, pngsig, 8) == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
126 return AVPROBE_SCORE_MAX;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
127 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
128 return 0;
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 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
131 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
132 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
133 if(items >= UINT_MAX / size)
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
134 return NULL;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
135 return av_malloc(items * size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
136 }
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 static void png_zfree(void *opaque, void *ptr)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
139 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
140 av_free(ptr);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
141 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
142
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
143 static int png_get_nb_channels(int color_type)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
144 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
145 int channels;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
146 channels = 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
147 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
148 PNG_COLOR_MASK_COLOR)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
149 channels = 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
150 if (color_type & PNG_COLOR_MASK_ALPHA)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
151 channels++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
152 return channels;
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
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
155 /* compute the row size of an interleaved pass */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
156 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
157 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
158 int shift, xmin, pass_width;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
159
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
160 xmin = png_pass_xmin[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
161 if (width <= xmin)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
162 return 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
163 shift = png_pass_xshift[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
164 pass_width = (width - xmin + (1 << shift) - 1) >> shift;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
165 return (pass_width * bits_per_pixel + 7) >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
166 }
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 /* 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
169 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
170 this stage */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
171 static void png_put_interlaced_row(uint8_t *dst, int width,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
172 int bits_per_pixel, int pass,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
173 int color_type, const uint8_t *src)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
174 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
175 int x, mask, dsp_mask, j, src_x, b, bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
176 uint8_t *d;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
177 const uint8_t *s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
178
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
179 mask = png_pass_mask[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
180 dsp_mask = png_pass_dsp_mask[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
181 switch(bits_per_pixel) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
182 case 1:
5097
e9a0c447dc73 spelling
diego
parents: 5089
diff changeset
183 /* we must initialize the line to zero before writing to it */
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
184 if (pass == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
185 memset(dst, 0, (width + 7) >> 3);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
186 src_x = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
187 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
188 j = (x & 7);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
189 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
190 b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
191 dst[x >> 3] |= b << (7 - j);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
192 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
193 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
194 src_x++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
195 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
196 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
197 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
198 bpp = bits_per_pixel >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
199 d = dst;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
200 s = src;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
201 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
202 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
203 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
204 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
205 *(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
206 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
207 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
208 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
209 s += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
210 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
211 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
212 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
213 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
214 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
215 memcpy(d, s, bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
216 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
217 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
218 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
219 s += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
220 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
221 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
222 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
223 }
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
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
226 #ifdef CONFIG_ENCODERS
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
227 static void png_get_interlaced_row(uint8_t *dst, int row_size,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
228 int bits_per_pixel, int pass,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
229 const uint8_t *src, int width)
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 int x, mask, dst_x, j, b, bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
232 uint8_t *d;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
233 const uint8_t *s;
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 mask = png_pass_mask[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
236 switch(bits_per_pixel) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
237 case 1:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
238 memset(dst, 0, row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
239 dst_x = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
240 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
241 j = (x & 7);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
242 if ((mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
243 b = (src[x >> 3] >> (7 - j)) & 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
244 dst[dst_x >> 3] |= b << (7 - (dst_x & 7));
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
245 dst_x++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
246 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
247 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
248 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
249 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
250 bpp = bits_per_pixel >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
251 d = dst;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
252 s = src;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
253 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
254 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
255 if ((mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
256 memcpy(d, s, bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
257 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
258 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
259 s += bpp;
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
262 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
263 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
264 #endif
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
265
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
266 /* XXX: optimize */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
267 /* NOTE: 'dst' can be equal to 'last' */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
268 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
269 uint8_t *src, uint8_t *last, int size, int bpp)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
270 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
271 int i, p;
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 switch(filter_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
274 case PNG_FILTER_VALUE_NONE:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
275 memcpy(dst, src, size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
276 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
277 case PNG_FILTER_VALUE_SUB:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
278 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
279 dst[i] = src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
280 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
281 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
282 p = dst[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
283 dst[i] = p + src[i];
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
286 case PNG_FILTER_VALUE_UP:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
287 for(i = 0; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
288 p = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
289 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
290 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
291 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
292 case PNG_FILTER_VALUE_AVG:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
293 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
294 p = (last[i] >> 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
295 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
296 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
297 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
298 p = ((dst[i - bpp] + last[i]) >> 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
299 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
300 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
301 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
302 case PNG_FILTER_VALUE_PAETH:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
303 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
304 p = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
305 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
306 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
307 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
308 int a, b, c, pa, pb, pc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
309
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
310 a = dst[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
311 b = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
312 c = last[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
313
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
314 p = b - c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
315 pc = a - c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
316
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
317 pa = abs(p);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
318 pb = abs(pc);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
319 pc = abs(p + pc);
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 if (pa <= pb && pa <= pc)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
322 p = a;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
323 else if (pb <= pc)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
324 p = b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
325 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
326 p = c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
327 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
328 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
329 break;
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
332
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
333 #ifdef CONFIG_ENCODERS
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
334 static void convert_from_rgb32(uint8_t *dst, const uint8_t *src, int width)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
335 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
336 uint8_t *d;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
337 int j;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
338 unsigned int v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
339
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
340 d = dst;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
341 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
342 v = ((const uint32_t *)src)[j];
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
343 d[0] = v >> 16;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
344 d[1] = v >> 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
345 d[2] = v;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
346 d[3] = v >> 24;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
347 d += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
348 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
349 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
350 #endif
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
351
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
352 #ifdef CONFIG_DECODERS
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
353 static void convert_to_rgb32(uint8_t *dst, const uint8_t *src, int width)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
354 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
355 int j;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
356 unsigned int r, g, b, a;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
357
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
358 for(j = 0;j < width; j++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
359 r = src[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
360 g = src[1];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
361 b = src[2];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
362 a = src[3];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
363 *(uint32_t *)dst = (a << 24) | (r << 16) | (g << 8) | b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
364 dst += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
365 src += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
366 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
367 }
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 /* process exactly one decompressed row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
370 static void png_handle_row(PNGContext *s)
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 uint8_t *ptr, *last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
373 int got_line;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
374
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
375 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
376 ptr = s->image_buf + s->image_linesize * s->y;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
377 /* need to swap bytes correctly for RGB_ALPHA */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
378 if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
379 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
380 s->last_row, s->row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
381 memcpy(s->last_row, s->tmp_row, s->row_size);
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
382 convert_to_rgb32(ptr, s->tmp_row, s->width);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
383 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
384 /* in normal case, we avoid one copy */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
385 if (s->y == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
386 last_row = s->last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
387 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
388 last_row = ptr - s->image_linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
389
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
390 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
391 last_row, s->row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
392 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
393 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
394 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
395 s->state |= PNG_ALLIMAGE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
396 }
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 got_line = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
399 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
400 ptr = s->image_buf + s->image_linesize * s->y;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
401 if ((png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
402 /* 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
403 wait for the next one */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
404 if (got_line)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
405 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
406 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
407 s->last_row, s->pass_row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
408 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
409 got_line = 1;
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 if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) {
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
412 /* NOTE: RGB32 is handled directly in png_put_interlaced_row */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
413 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
414 s->color_type, s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
415 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
416 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
417 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
418 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
419 if (s->pass == NB_PASSES - 1) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
420 s->state |= PNG_ALLIMAGE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
421 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
422 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
423 s->pass++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
424 s->y = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
425 s->pass_row_size = png_pass_row_size(s->pass,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
426 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
427 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
428 s->crow_size = s->pass_row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
429 if (s->pass_row_size != 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
430 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
431 /* skip pass if empty row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
432 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
433 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
434 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
435 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
436 the_end: ;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
437 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
438 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
439
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
440 static int png_decode_idat(PNGContext *s, int length)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
441 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
442 int ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
443 s->zstream.avail_in = length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
444 s->zstream.next_in = s->bytestream;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
445 s->bytestream += length;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
446
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
447 if(s->bytestream > s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
448 return -1;
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 /* decode one line if possible */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
451 while (s->zstream.avail_in > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
452 ret = inflate(&s->zstream, Z_PARTIAL_FLUSH);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
453 if (ret != Z_OK && ret != Z_STREAM_END) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
454 return -1;
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 if (s->zstream.avail_out == 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
457 if (!(s->state & PNG_ALLIMAGE)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
458 png_handle_row(s);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
459 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
460 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
461 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
462 }
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 return 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
465 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
466
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
467 static int decode_frame(AVCodecContext *avctx,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
468 void *data, int *data_size,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
469 uint8_t *buf, int buf_size)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
470 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
471 PNGContext * const s = avctx->priv_data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
472 AVFrame *picture = data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
473 AVFrame * const p= (AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
474 uint32_t tag, length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
475 int ret, crc;
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 s->bytestream_start=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
478 s->bytestream= buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
479 s->bytestream_end= buf + buf_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
480
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
481 /* check signature */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
482 if (memcmp(s->bytestream, pngsig, 8) != 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
483 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
484 s->bytestream+= 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
485 s->y=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
486 s->state=0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
487 // memset(s, 0, sizeof(PNGContext));
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
488 /* init the zlib */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
489 s->zstream.zalloc = png_zalloc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
490 s->zstream.zfree = png_zfree;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
491 s->zstream.opaque = NULL;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
492 ret = inflateInit(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
493 if (ret != Z_OK)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
494 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
495 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
496 int tag32;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
497 if (s->bytestream >= s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
498 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
499 length = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
500 if (length > 0x7fffffff)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
501 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
502 tag32 = bytestream_get_be32(&s->bytestream);
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
503 tag = bswap_32(tag32);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
504 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
505 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
506 (tag & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
507 ((tag >> 8) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
508 ((tag >> 16) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
509 ((tag >> 24) & 0xff), length);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
510 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
511 switch(tag) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
512 case MKTAG('I', 'H', 'D', 'R'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
513 if (length != 13)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
514 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
515 s->width = bytestream_get_be32(&s->bytestream);
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
516 s->height = bytestream_get_be32(&s->bytestream);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
517 if(avcodec_check_dimensions(avctx, s->width, s->height)){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
518 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
519 goto fail;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
520 }
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
521 s->bit_depth = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
522 s->color_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
523 s->compression_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
524 s->filter_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
525 s->interlace_type = *s->bytestream++;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
526 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
527 s->state |= PNG_IHDR;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
528 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
529 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
530 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
531 s->compression_type, s->filter_type, s->interlace_type);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
532 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
533 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
534 case MKTAG('I', 'D', 'A', 'T'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
535 if (!(s->state & PNG_IHDR))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
536 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
537 if (!(s->state & PNG_IDAT)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
538 /* init image info */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
539 avctx->width = s->width;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
540 avctx->height = s->height;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
541
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
542 s->channels = png_get_nb_channels(s->color_type);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
543 s->bits_per_pixel = s->bit_depth * s->channels;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
544 s->bpp = (s->bits_per_pixel + 7) >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
545 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
546
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
547 if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
548 s->color_type == PNG_COLOR_TYPE_RGB) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
549 avctx->pix_fmt = PIX_FMT_RGB24;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
550 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
551 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4379
diff changeset
552 avctx->pix_fmt = PIX_FMT_RGB32;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
553 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
554 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
555 avctx->pix_fmt = PIX_FMT_GRAY8;
4067
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
556 } else if (s->bit_depth == 16 &&
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
557 s->color_type == PNG_COLOR_TYPE_GRAY) {
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
558 avctx->pix_fmt = PIX_FMT_GRAY16BE;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
559 } else if (s->bit_depth == 1 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
560 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
561 avctx->pix_fmt = PIX_FMT_MONOBLACK;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
562 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
563 avctx->pix_fmt = PIX_FMT_PAL8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
564 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
565 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
566 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
567 if(p->data[0])
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
568 avctx->release_buffer(avctx, p);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
569
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
570 p->reference= 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
571 if(avctx->get_buffer(avctx, p) < 0){
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
572 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
573 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
574 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
575 p->pict_type= FF_I_TYPE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
576 p->key_frame= 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
577 p->interlaced_frame = !!s->interlace_type;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
578
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
579 /* compute the compressed row size */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
580 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
581 s->crow_size = s->row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
582 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
583 s->pass = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
584 s->pass_row_size = png_pass_row_size(s->pass,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
585 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
586 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
587 s->crow_size = s->pass_row_size + 1;
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 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
590 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
591 s->row_size, s->crow_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
592 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
593 s->image_buf = p->data[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
594 s->image_linesize = p->linesize[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
595 /* copy the palette if needed */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
596 if (s->color_type == PNG_COLOR_TYPE_PALETTE)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
597 memcpy(p->data[1], s->palette, 256 * sizeof(uint32_t));
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
598 /* empty row is used if differencing to the first row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
599 s->last_row = av_mallocz(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
600 if (!s->last_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
601 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
602 if (s->interlace_type ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
603 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
604 s->tmp_row = av_malloc(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
605 if (!s->tmp_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
606 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
607 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
608 /* compressed row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
609 s->crow_buf = av_malloc(s->row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
610 if (!s->crow_buf)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
611 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
612 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
613 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
614 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
615 s->state |= PNG_IDAT;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
616 if (png_decode_idat(s, length) < 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
617 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
618 /* skip crc */
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
619 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
620 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
621 case MKTAG('P', 'L', 'T', 'E'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
622 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
623 int n, i, r, g, b;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
624
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
625 if ((length % 3) != 0 || length > 256 * 3)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
626 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
627 /* read the palette */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
628 n = length / 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
629 for(i=0;i<n;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
630 r = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
631 g = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
632 b = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
633 s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
634 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
635 for(;i<256;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
636 s->palette[i] = (0xff << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
637 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
638 s->state |= PNG_PLTE;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
639 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
640 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
641 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
642 case MKTAG('t', 'R', 'N', 'S'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
643 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
644 int v, i;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
645
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
646 /* read the transparency. XXX: Only palette mode supported */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
647 if (s->color_type != PNG_COLOR_TYPE_PALETTE ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
648 length > 256 ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
649 !(s->state & PNG_PLTE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
650 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
651 for(i=0;i<length;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
652 v = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
653 s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
654 }
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
655 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
656 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
657 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
658 case MKTAG('I', 'E', 'N', 'D'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
659 if (!(s->state & PNG_ALLIMAGE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
660 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
661 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
662 goto exit_loop;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
663 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
664 /* skip tag */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
665 skip_tag:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
666 s->bytestream += length + 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
667 break;
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
670 exit_loop:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
671 *picture= *(AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
672 *data_size = sizeof(AVPicture);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
673
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
674 ret = s->bytestream - s->bytestream_start;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
675 the_end:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
676 inflateEnd(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
677 av_freep(&s->crow_buf);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
678 av_freep(&s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
679 av_freep(&s->tmp_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
680 return ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
681 fail:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
682 ret = -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
683 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
684 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
685 #endif
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
686
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
687 #ifdef CONFIG_ENCODERS
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
688 static void png_write_chunk(uint8_t **f, uint32_t tag,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
689 const uint8_t *buf, int length)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
690 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
691 uint32_t crc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
692 uint8_t tagbuf[4];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
693
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
694 bytestream_put_be32(f, length);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
695 crc = crc32(0, Z_NULL, 0);
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 5067
diff changeset
696 AV_WL32(tagbuf, tag);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
697 crc = crc32(crc, tagbuf, 4);
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
698 bytestream_put_be32(f, bswap_32(tag));
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
699 if (length > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
700 crc = crc32(crc, buf, length);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
701 memcpy(*f, buf, length);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
702 *f += length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
703 }
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
704 bytestream_put_be32(f, crc);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
705 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
706
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
707 /* XXX: do filtering */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
708 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
709 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
710 int ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
711
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
712 s->zstream.avail_in = size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
713 s->zstream.next_in = (uint8_t *)data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
714 while (s->zstream.avail_in > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
715 ret = deflate(&s->zstream, Z_NO_FLUSH);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
716 if (ret != Z_OK)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
717 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
718 if (s->zstream.avail_out == 0) {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
719 if(s->bytestream_end - s->bytestream > IOBUF_SIZE + 100)
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
720 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
721 s->zstream.avail_out = IOBUF_SIZE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
722 s->zstream.next_out = s->buf;
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
725 return 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
726 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
727 #endif /* CONFIG_ENCODERS */
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
728
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
729 static int common_init(AVCodecContext *avctx){
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
730 PNGContext *s = avctx->priv_data;
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 avcodec_get_frame_defaults((AVFrame*)&s->picture);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
733 avctx->coded_frame= (AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
734 // s->avctx= avctx;
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 return 0;
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
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
739 #ifdef CONFIG_ENCODERS
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
740 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
741 PNGContext *s = avctx->priv_data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
742 AVFrame *pict = data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
743 AVFrame * const p= (AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
744 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
745 int bits_per_pixel, pass_row_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
746 uint8_t *ptr;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
747 uint8_t *crow_buf = NULL;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
748 uint8_t *tmp_buf = NULL;
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 *p = *pict;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
751 p->pict_type= FF_I_TYPE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
752 p->key_frame= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
753
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
754 s->bytestream_start=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
755 s->bytestream= buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
756 s->bytestream_end= buf+buf_size;
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 is_progressive = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
759 switch(avctx->pix_fmt) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4379
diff changeset
760 case PIX_FMT_RGB32:
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
761 bit_depth = 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
762 color_type = PNG_COLOR_TYPE_RGB_ALPHA;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
763 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
764 case PIX_FMT_RGB24:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
765 bit_depth = 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
766 color_type = PNG_COLOR_TYPE_RGB;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
767 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
768 case PIX_FMT_GRAY8:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
769 bit_depth = 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
770 color_type = PNG_COLOR_TYPE_GRAY;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
771 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
772 case PIX_FMT_MONOBLACK:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
773 bit_depth = 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
774 color_type = PNG_COLOR_TYPE_GRAY;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
775 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
776 case PIX_FMT_PAL8:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
777 bit_depth = 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
778 color_type = PNG_COLOR_TYPE_PALETTE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
779 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
780 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
781 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
782 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
783 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
784 row_size = (avctx->width * bits_per_pixel + 7) >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
785
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
786 s->zstream.zalloc = png_zalloc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
787 s->zstream.zfree = png_zfree;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
788 s->zstream.opaque = NULL;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
789 ret = deflateInit2(&s->zstream, Z_DEFAULT_COMPRESSION,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
790 Z_DEFLATED, 15, 8, Z_DEFAULT_STRATEGY);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
791 if (ret != Z_OK)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
792 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
793 crow_buf = av_malloc(row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
794 if (!crow_buf)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
795 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
796 if (is_progressive) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
797 tmp_buf = av_malloc(row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
798 if (!tmp_buf)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
799 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
800 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
801
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
802 /* write png header */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
803 memcpy(s->bytestream, pngsig, 8);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
804 s->bytestream += 8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
805
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
806 AV_WB32(s->buf, avctx->width);
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
807 AV_WB32(s->buf + 4, avctx->height);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
808 s->buf[8] = bit_depth;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
809 s->buf[9] = color_type;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
810 s->buf[10] = 0; /* compression type */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
811 s->buf[11] = 0; /* filter type */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
812 s->buf[12] = is_progressive; /* interlace type */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
813
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
814 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
815
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
816 /* put the palette if needed */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
817 if (color_type == PNG_COLOR_TYPE_PALETTE) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
818 int has_alpha, alpha, i;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
819 unsigned int v;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
820 uint32_t *palette;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
821 uint8_t *alpha_ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
822
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
823 palette = (uint32_t *)p->data[1];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
824 ptr = s->buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
825 alpha_ptr = s->buf + 256 * 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
826 has_alpha = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
827 for(i = 0; i < 256; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
828 v = palette[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
829 alpha = v >> 24;
4018
9c8ab288ebf6 Make PNG produce correct 8-bit pictures
kostya
parents: 3947
diff changeset
830 if (alpha && alpha != 0xff)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
831 has_alpha = 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
832 *alpha_ptr++ = alpha;
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 5067
diff changeset
833 bytestream_put_be24(&ptr, v);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
834 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
835 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
836 if (has_alpha) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
837 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
838 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
839 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
840
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
841 /* now put each row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
842 s->zstream.avail_out = IOBUF_SIZE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
843 s->zstream.next_out = s->buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
844 if (is_progressive) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
845 uint8_t *ptr1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
846 int pass;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
847
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
848 for(pass = 0; pass < NB_PASSES; pass++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
849 /* 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
850 output */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
851 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
852 if (pass_row_size > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
853 for(y = 0; y < avctx->height; y++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
854 if ((png_pass_ymask[pass] << (y & 7)) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
855 ptr = p->data[0] + y * p->linesize[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
856 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
857 convert_from_rgb32(tmp_buf, ptr, avctx->width);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
858 ptr1 = tmp_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
859 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
860 ptr1 = ptr;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
861 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
862 png_get_interlaced_row(crow_buf + 1, pass_row_size,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
863 bits_per_pixel, pass,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
864 ptr1, avctx->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
865 crow_buf[0] = PNG_FILTER_VALUE_NONE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
866 png_write_row(s, crow_buf, pass_row_size + 1);
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
871 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
872 for(y = 0; y < avctx->height; y++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
873 ptr = p->data[0] + y * p->linesize[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
874 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
875 convert_from_rgb32(crow_buf + 1, ptr, avctx->width);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
876 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
877 memcpy(crow_buf + 1, ptr, row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
878 crow_buf[0] = PNG_FILTER_VALUE_NONE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
879 png_write_row(s, crow_buf, row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
880 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
881 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
882 /* compress last bytes */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
883 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
884 ret = deflate(&s->zstream, Z_FINISH);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
885 if (ret == Z_OK || ret == Z_STREAM_END) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
886 len = IOBUF_SIZE - s->zstream.avail_out;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
887 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
888 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
889 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
890 s->zstream.avail_out = IOBUF_SIZE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
891 s->zstream.next_out = s->buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
892 if (ret == Z_STREAM_END)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
893 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
894 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
895 goto fail;
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 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
899
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
900 ret = s->bytestream - s->bytestream_start;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
901 the_end:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
902 av_free(crow_buf);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
903 av_free(tmp_buf);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
904 deflateEnd(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
905 return ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
906 fail:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
907 ret = -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
908 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
909 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
910 #endif
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
911
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
912 #ifdef CONFIG_PNG_DECODER
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
913 AVCodec png_decoder = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
914 "png",
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
915 CODEC_TYPE_VIDEO,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
916 CODEC_ID_PNG,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
917 sizeof(PNGContext),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
918 common_init,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
919 NULL,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
920 NULL, //decode_end,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
921 decode_frame,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
922 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
923 NULL
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
924 };
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3347
diff changeset
925 #endif
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
926
2661
b2846918585c a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents: 2453
diff changeset
927 #ifdef CONFIG_PNG_ENCODER
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
928 AVCodec png_encoder = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
929 "png",
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
930 CODEC_TYPE_VIDEO,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
931 CODEC_ID_PNG,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
932 sizeof(PNGContext),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
933 common_init,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
934 encode_frame,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
935 NULL, //encode_end,
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4379
diff changeset
936 .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, -1},
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
937 };
2661
b2846918585c a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents: 2453
diff changeset
938 #endif // CONFIG_PNG_ENCODER