annotate pngdec.c @ 6323:e6da66f378c7 libavcodec

mpegvideo.h has two function declarations with the 'inline' specifier but no definition for those functions. The C standard requires a definition to appear in the same translation unit for any function declared with 'inline'. Most of the files including mpegvideo.h do not define those functions. Fix this by removing the 'inline' specifiers from the header. patch by Uoti Urpala
author diego
date Sun, 03 Feb 2008 17:54:30 +0000
parents 817e302aae08
children 0a403ade8c81
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"
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
23 #include "png.h"
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
24
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
25 /* TODO:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
26 * - add 2, 4 and 16 bit depth support
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
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
33 typedef struct PNGDecContext {
6245
michael
parents: 5355
diff changeset
34 const uint8_t *bytestream;
michael
parents: 5355
diff changeset
35 const uint8_t *bytestream_start;
michael
parents: 5355
diff changeset
36 const uint8_t *bytestream_end;
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
37 AVFrame picture;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
38
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
39 int state;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
40 int width, height;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
41 int bit_depth;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
42 int color_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
43 int compression_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
44 int interlace_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
45 int filter_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
46 int channels;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
47 int bits_per_pixel;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
48 int bpp;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
49
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
50 uint8_t *image_buf;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
51 int image_linesize;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
52 uint32_t palette[256];
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
53 uint8_t *crow_buf;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
54 uint8_t *last_row;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
55 uint8_t *tmp_row;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
56 int pass;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
57 int crow_size; /* compressed row size (include filter type) */
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
58 int row_size; /* decompressed row size */
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
59 int pass_row_size; /* decompress row size of the current pass */
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
60 int y;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
61 z_stream zstream;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
62 } PNGDecContext;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
63
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
64 /* 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
65 static const uint8_t png_pass_dsp_ymask[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
66 0xff, 0xff, 0x0f, 0xcc, 0x33, 0xff, 0x55,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
67 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
68
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
69 /* Mask to determine which pixels to overwrite while displaying */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
70 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
71 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
72 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
73
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
74 /* NOTE: we try to construct a good looking image at each pass. width
5355
45d083bbbbe7 typo fixes
diego
parents: 5339
diff changeset
75 is the original image width. We also do pixel format conversion at
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
76 this stage */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
77 static void png_put_interlaced_row(uint8_t *dst, int width,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
78 int bits_per_pixel, int pass,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
79 int color_type, const uint8_t *src)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
80 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
81 int x, mask, dsp_mask, j, src_x, b, bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
82 uint8_t *d;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
83 const uint8_t *s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
84
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
85 mask = ff_png_pass_mask[pass];
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
86 dsp_mask = png_pass_dsp_mask[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
87 switch(bits_per_pixel) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
88 case 1:
5097
e9a0c447dc73 spelling
diego
parents: 5089
diff changeset
89 /* 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
90 if (pass == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
91 memset(dst, 0, (width + 7) >> 3);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
92 src_x = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
93 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
94 j = (x & 7);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
95 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
96 b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
97 dst[x >> 3] |= b << (7 - j);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
98 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
99 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
100 src_x++;
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
103 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
104 bpp = bits_per_pixel >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
105 d = dst;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
106 s = src;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
107 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
108 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
109 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
110 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
111 *(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
112 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
113 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
114 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
115 s += bpp;
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 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
118 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
119 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
120 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
121 memcpy(d, s, bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
122 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
123 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
124 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
125 s += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
126 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
127 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
128 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
129 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
130 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
131
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
132 /* XXX: optimize */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
133 /* NOTE: 'dst' can be equal to 'last' */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
134 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
135 uint8_t *src, uint8_t *last, int size, int bpp)
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 int i, p;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
138
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
139 switch(filter_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
140 case PNG_FILTER_VALUE_NONE:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
141 memcpy(dst, src, size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
142 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
143 case PNG_FILTER_VALUE_SUB:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
144 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
145 dst[i] = src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
146 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
147 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
148 p = dst[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
149 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
150 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
151 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
152 case PNG_FILTER_VALUE_UP:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
153 for(i = 0; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
154 p = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
155 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
156 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
157 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
158 case PNG_FILTER_VALUE_AVG:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
159 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
160 p = (last[i] >> 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
161 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
162 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
163 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
164 p = ((dst[i - bpp] + last[i]) >> 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
165 dst[i] = p + src[i];
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
168 case PNG_FILTER_VALUE_PAETH:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
169 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
170 p = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
171 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
172 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
173 for(i = bpp; i < size; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
174 int a, b, c, pa, pb, pc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
175
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
176 a = dst[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
177 b = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
178 c = last[i - bpp];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
179
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
180 p = b - c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
181 pc = a - c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
182
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
183 pa = abs(p);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
184 pb = abs(pc);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
185 pc = abs(p + pc);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
186
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
187 if (pa <= pb && pa <= pc)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
188 p = a;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
189 else if (pb <= pc)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
190 p = b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
191 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
192 p = c;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
193 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
194 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
195 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
196 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
197 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
198
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
199 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
200 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
201 int j;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
202 unsigned int r, g, b, a;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
203
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
204 for(j = 0;j < width; j++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
205 r = src[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
206 g = src[1];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
207 b = src[2];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
208 a = src[3];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
209 *(uint32_t *)dst = (a << 24) | (r << 16) | (g << 8) | b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
210 dst += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
211 src += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
212 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
213 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
214
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
215 /* process exactly one decompressed row */
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
216 static void png_handle_row(PNGDecContext *s)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
217 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
218 uint8_t *ptr, *last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
219 int got_line;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
220
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
221 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
222 ptr = s->image_buf + s->image_linesize * s->y;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
223 /* need to swap bytes correctly for RGB_ALPHA */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
224 if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
225 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
226 s->last_row, s->row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
227 memcpy(s->last_row, s->tmp_row, s->row_size);
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
228 convert_to_rgb32(ptr, s->tmp_row, s->width);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
229 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
230 /* in normal case, we avoid one copy */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
231 if (s->y == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
232 last_row = s->last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
233 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
234 last_row = ptr - s->image_linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
235
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
236 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
237 last_row, s->row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
238 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
239 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
240 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
241 s->state |= PNG_ALLIMAGE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
242 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
243 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
244 got_line = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
245 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
246 ptr = s->image_buf + s->image_linesize * s->y;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
247 if ((ff_png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) {
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
248 /* 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
249 wait for the next one */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
250 if (got_line)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
251 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
252 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
253 s->last_row, s->pass_row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
254 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
255 got_line = 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
256 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
257 if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) {
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
258 /* NOTE: RGB32 is handled directly in png_put_interlaced_row */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
259 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
260 s->color_type, s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
261 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
262 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
263 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
264 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
265 if (s->pass == NB_PASSES - 1) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
266 s->state |= PNG_ALLIMAGE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
267 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
268 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
269 s->pass++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
270 s->y = 0;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
271 s->pass_row_size = ff_png_pass_row_size(s->pass,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
272 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
273 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
274 s->crow_size = s->pass_row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
275 if (s->pass_row_size != 0)
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 /* skip pass if empty row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
278 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
279 }
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
282 the_end: ;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
283 }
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
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
286 static int png_decode_idat(PNGDecContext *s, int length)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
287 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
288 int ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
289 s->zstream.avail_in = length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
290 s->zstream.next_in = s->bytestream;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
291 s->bytestream += length;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
292
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
293 if(s->bytestream > s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
294 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
295
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
296 /* decode one line if possible */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
297 while (s->zstream.avail_in > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
298 ret = inflate(&s->zstream, Z_PARTIAL_FLUSH);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
299 if (ret != Z_OK && ret != Z_STREAM_END) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
300 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
301 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
302 if (s->zstream.avail_out == 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
303 if (!(s->state & PNG_ALLIMAGE)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
304 png_handle_row(s);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
305 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
306 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
307 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
308 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
309 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
310 return 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
311 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
312
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
313 static int decode_frame(AVCodecContext *avctx,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
314 void *data, int *data_size,
6245
michael
parents: 5355
diff changeset
315 const uint8_t *buf, int buf_size)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
316 {
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
317 PNGDecContext * const s = avctx->priv_data;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
318 AVFrame *picture = data;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
319 AVFrame * const p= (AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
320 uint32_t tag, length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
321 int ret, crc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
322
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
323 s->bytestream_start=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
324 s->bytestream= buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
325 s->bytestream_end= buf + buf_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
326
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
327 /* check signature */
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
328 if (memcmp(s->bytestream, ff_pngsig, 8) != 0)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
329 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
330 s->bytestream+= 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
331 s->y=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
332 s->state=0;
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
333 // memset(s, 0, sizeof(PNGDecContext));
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
334 /* init the zlib */
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
335 s->zstream.zalloc = ff_png_zalloc;
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
336 s->zstream.zfree = ff_png_zfree;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
337 s->zstream.opaque = NULL;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
338 ret = inflateInit(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
339 if (ret != Z_OK)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
340 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
341 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
342 int tag32;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
343 if (s->bytestream >= s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
344 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
345 length = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
346 if (length > 0x7fffffff)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
347 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
348 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
349 tag = bswap_32(tag32);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
350 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
351 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
352 (tag & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
353 ((tag >> 8) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
354 ((tag >> 16) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
355 ((tag >> 24) & 0xff), length);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
356 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
357 switch(tag) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
358 case MKTAG('I', 'H', 'D', 'R'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
359 if (length != 13)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
360 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
361 s->width = bytestream_get_be32(&s->bytestream);
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
362 s->height = bytestream_get_be32(&s->bytestream);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
363 if(avcodec_check_dimensions(avctx, s->width, s->height)){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
364 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
365 goto fail;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
366 }
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
367 s->bit_depth = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
368 s->color_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
369 s->compression_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
370 s->filter_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
371 s->interlace_type = *s->bytestream++;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
372 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
373 s->state |= PNG_IHDR;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
374 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
375 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
376 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
377 s->compression_type, s->filter_type, s->interlace_type);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
378 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
379 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
380 case MKTAG('I', 'D', 'A', 'T'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
381 if (!(s->state & PNG_IHDR))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
382 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
383 if (!(s->state & PNG_IDAT)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
384 /* init image info */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
385 avctx->width = s->width;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
386 avctx->height = s->height;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
387
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
388 s->channels = ff_png_get_nb_channels(s->color_type);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
389 s->bits_per_pixel = s->bit_depth * s->channels;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
390 s->bpp = (s->bits_per_pixel + 7) >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
391 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
392
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
393 if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
394 s->color_type == PNG_COLOR_TYPE_RGB) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
395 avctx->pix_fmt = PIX_FMT_RGB24;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
396 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
397 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4379
diff changeset
398 avctx->pix_fmt = PIX_FMT_RGB32;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
399 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
400 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
401 avctx->pix_fmt = PIX_FMT_GRAY8;
4067
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
402 } else if (s->bit_depth == 16 &&
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
403 s->color_type == PNG_COLOR_TYPE_GRAY) {
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
404 avctx->pix_fmt = PIX_FMT_GRAY16BE;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
405 } else if (s->bit_depth == 1 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
406 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
407 avctx->pix_fmt = PIX_FMT_MONOBLACK;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
408 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
409 avctx->pix_fmt = PIX_FMT_PAL8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
410 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
411 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
412 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
413 if(p->data[0])
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
414 avctx->release_buffer(avctx, p);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
415
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
416 p->reference= 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
417 if(avctx->get_buffer(avctx, p) < 0){
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
418 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
419 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
420 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
421 p->pict_type= FF_I_TYPE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
422 p->key_frame= 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
423 p->interlaced_frame = !!s->interlace_type;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
424
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
425 /* compute the compressed row size */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
426 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
427 s->crow_size = s->row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
428 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
429 s->pass = 0;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
430 s->pass_row_size = ff_png_pass_row_size(s->pass,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
431 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
432 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
433 s->crow_size = s->pass_row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
434 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
435 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
436 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
437 s->row_size, s->crow_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
438 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
439 s->image_buf = p->data[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
440 s->image_linesize = p->linesize[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
441 /* copy the palette if needed */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
442 if (s->color_type == PNG_COLOR_TYPE_PALETTE)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
443 memcpy(p->data[1], s->palette, 256 * sizeof(uint32_t));
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
444 /* empty row is used if differencing to the first row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
445 s->last_row = av_mallocz(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
446 if (!s->last_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
447 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
448 if (s->interlace_type ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
449 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
450 s->tmp_row = av_malloc(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
451 if (!s->tmp_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
452 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
453 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
454 /* compressed row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
455 s->crow_buf = av_malloc(s->row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
456 if (!s->crow_buf)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
457 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
458 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
459 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
460 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
461 s->state |= PNG_IDAT;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
462 if (png_decode_idat(s, length) < 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
463 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
464 /* skip crc */
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
465 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
466 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
467 case MKTAG('P', 'L', 'T', 'E'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
468 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
469 int n, i, r, g, b;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
470
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
471 if ((length % 3) != 0 || length > 256 * 3)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
472 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
473 /* read the palette */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
474 n = length / 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
475 for(i=0;i<n;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
476 r = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
477 g = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
478 b = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
479 s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b;
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 for(;i<256;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
482 s->palette[i] = (0xff << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
483 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
484 s->state |= PNG_PLTE;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
485 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
486 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
487 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
488 case MKTAG('t', 'R', 'N', 'S'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
489 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
490 int v, i;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
491
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
492 /* read the transparency. XXX: Only palette mode supported */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
493 if (s->color_type != PNG_COLOR_TYPE_PALETTE ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
494 length > 256 ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
495 !(s->state & PNG_PLTE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
496 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
497 for(i=0;i<length;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
498 v = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
499 s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
500 }
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
501 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
502 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
503 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
504 case MKTAG('I', 'E', 'N', 'D'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
505 if (!(s->state & PNG_ALLIMAGE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
506 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
507 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
508 goto exit_loop;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
509 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
510 /* skip tag */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
511 skip_tag:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
512 s->bytestream += length + 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
513 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
514 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
515 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
516 exit_loop:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
517 *picture= *(AVFrame*)&s->picture;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
518 *data_size = sizeof(AVPicture);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
519
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
520 ret = s->bytestream - s->bytestream_start;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
521 the_end:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
522 inflateEnd(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
523 av_freep(&s->crow_buf);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
524 av_freep(&s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
525 av_freep(&s->tmp_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
526 return ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
527 fail:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
528 ret = -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
529 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
530 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
531
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
532 static int png_dec_init(AVCodecContext *avctx){
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
533 PNGDecContext *s = avctx->priv_data;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
534
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
535 avcodec_get_frame_defaults((AVFrame*)&s->picture);
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
536 avctx->coded_frame= (AVFrame*)&s->picture;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
537
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
538 return 0;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
539 }
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
540
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
541 AVCodec png_decoder = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
542 "png",
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
543 CODEC_TYPE_VIDEO,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
544 CODEC_ID_PNG,
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
545 sizeof(PNGDecContext),
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
546 png_dec_init,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
547 NULL,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
548 NULL, //decode_end,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
549 decode_frame,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
550 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
551 NULL
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
552 };