annotate pngdec.c @ 9525:ad29ff444476 libavcodec

100l: VLC table array should not be const
author kostya
date Tue, 21 Apr 2009 17:35:30 +0000
parents cd207441ca56
children 05cf2547e0f0
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
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 7236
diff changeset
3 * Copyright (c) 2003 Fabrice Bellard
2342
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"
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
24 #include "dsputil.h"
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
25
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
26 /* TODO:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
27 * - add 2, 4 and 16 bit depth support
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
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
30 #include <zlib.h>
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
31
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
32 //#define DEBUG
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
33
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
34 typedef struct PNGDecContext {
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
35 DSPContext dsp;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
36
6245
michael
parents: 5355
diff changeset
37 const uint8_t *bytestream;
michael
parents: 5355
diff changeset
38 const uint8_t *bytestream_start;
michael
parents: 5355
diff changeset
39 const uint8_t *bytestream_end;
9387
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
40 AVFrame picture1, picture2;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
41 AVFrame *current_picture, *last_picture;
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
42
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
43 int state;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
44 int width, height;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
45 int bit_depth;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
46 int color_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
47 int compression_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
48 int interlace_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
49 int filter_type;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
50 int channels;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
51 int bits_per_pixel;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
52 int bpp;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
53
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
54 uint8_t *image_buf;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
55 int image_linesize;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
56 uint32_t palette[256];
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
57 uint8_t *crow_buf;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
58 uint8_t *last_row;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
59 uint8_t *tmp_row;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
60 int pass;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
61 int crow_size; /* compressed row size (include filter type) */
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
62 int row_size; /* decompressed row size */
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
63 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
64 int y;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
65 z_stream zstream;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
66 } PNGDecContext;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
67
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
68 /* 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
69 static const uint8_t png_pass_dsp_ymask[NB_PASSES] = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
70 0xff, 0xff, 0x0f, 0xcc, 0x33, 0xff, 0x55,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
71 };
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 /* Mask to determine which pixels to overwrite while displaying */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
74 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
75 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
76 };
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
77
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
78 /* NOTE: we try to construct a good looking image at each pass. width
5355
45d083bbbbe7 typo fixes
diego
parents: 5339
diff changeset
79 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
80 this stage */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
81 static void png_put_interlaced_row(uint8_t *dst, int width,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
82 int bits_per_pixel, int pass,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
83 int color_type, const uint8_t *src)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
84 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
85 int x, mask, dsp_mask, j, src_x, b, bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
86 uint8_t *d;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
87 const uint8_t *s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
88
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
89 mask = ff_png_pass_mask[pass];
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
90 dsp_mask = png_pass_dsp_mask[pass];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
91 switch(bits_per_pixel) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
92 case 1:
5097
e9a0c447dc73 spelling
diego
parents: 5089
diff changeset
93 /* 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
94 if (pass == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
95 memset(dst, 0, (width + 7) >> 3);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
96 src_x = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
97 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
98 j = (x & 7);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
99 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
100 b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
101 dst[x >> 3] |= b << (7 - j);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
102 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
103 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
104 src_x++;
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
107 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
108 bpp = bits_per_pixel >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
109 d = dst;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
110 s = src;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
111 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
112 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
113 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
114 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
115 *(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
116 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
117 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
118 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
119 s += bpp;
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 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
122 for(x = 0; x < width; x++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
123 j = x & 7;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
124 if ((dsp_mask << j) & 0x80) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
125 memcpy(d, 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 d += bpp;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
128 if ((mask << j) & 0x80)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
129 s += bpp;
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 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
133 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
134 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
135
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
136 void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp)
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
137 {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
138 int i;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
139 for(i = 0; i < w; i++) {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
140 int a, b, c, p, pa, pb, pc;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
141
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
142 a = dst[i - bpp];
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
143 b = top[i];
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
144 c = top[i - bpp];
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
145
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
146 p = b - c;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
147 pc = a - c;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
148
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
149 pa = abs(p);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
150 pb = abs(pc);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
151 pc = abs(p + pc);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
152
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
153 if (pa <= pb && pa <= pc)
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
154 p = a;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
155 else if (pb <= pc)
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
156 p = b;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
157 else
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
158 p = c;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
159 dst[i] = p + src[i];
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
160 }
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
161 }
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
162
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
163 #define UNROLL1(bpp, op) {\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
164 r = dst[0];\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
165 if(bpp >= 2) g = dst[1];\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
166 if(bpp >= 3) b = dst[2];\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
167 if(bpp >= 4) a = dst[3];\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
168 for(; i < size; i+=bpp) {\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
169 dst[i+0] = r = op(r, src[i+0], last[i+0]);\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
170 if(bpp == 1) continue;\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
171 dst[i+1] = g = op(g, src[i+1], last[i+1]);\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
172 if(bpp == 2) continue;\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
173 dst[i+2] = b = op(b, src[i+2], last[i+2]);\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
174 if(bpp == 3) continue;\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
175 dst[i+3] = a = op(a, src[i+3], last[i+3]);\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
176 }\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
177 }
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
178
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
179 #define UNROLL_FILTER(op)\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
180 if(bpp == 1) UNROLL1(1, op)\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
181 else if(bpp == 2) UNROLL1(2, op)\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
182 else if(bpp == 3) UNROLL1(3, op)\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
183 else if(bpp == 4) UNROLL1(4, op)\
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
184
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
185 /* NOTE: 'dst' can be equal to 'last' */
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
186 static void png_filter_row(DSPContext *dsp, uint8_t *dst, int filter_type,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
187 uint8_t *src, uint8_t *last, int size, int bpp)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
188 {
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
189 int i, p, r, g, b, a;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
190
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
191 switch(filter_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
192 case PNG_FILTER_VALUE_NONE:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
193 memcpy(dst, src, size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
194 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
195 case PNG_FILTER_VALUE_SUB:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
196 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
197 dst[i] = src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
198 }
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
199 if(bpp == 4) {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
200 p = *(int*)dst;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
201 for(; i < size; i+=bpp) {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
202 int s = *(int*)(src+i);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
203 p = ((s&0x7f7f7f7f) + (p&0x7f7f7f7f)) ^ ((s^p)&0x80808080);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
204 *(int*)(dst+i) = p;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
205 }
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
206 } else {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
207 #define OP_SUB(x,s,l) x+s
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
208 UNROLL_FILTER(OP_SUB);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
209 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
210 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
211 case PNG_FILTER_VALUE_UP:
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
212 dsp->add_bytes_l2(dst, src, last, size);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
213 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
214 case PNG_FILTER_VALUE_AVG:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
215 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
216 p = (last[i] >> 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
217 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
218 }
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
219 #define OP_AVG(x,s,l) (((x + l) >> 1) + s) & 0xff
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
220 UNROLL_FILTER(OP_AVG);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
221 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
222 case PNG_FILTER_VALUE_PAETH:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
223 for(i = 0; i < bpp; i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
224 p = last[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
225 dst[i] = p + src[i];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
226 }
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
227 if(bpp > 1 && size > 4) {
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
228 // would write off the end of the array if we let it process the last pixel with bpp=3
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
229 int w = bpp==4 ? size : size-3;
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
230 dsp->add_png_paeth_prediction(dst+i, src+i, last+i, w-i, bpp);
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
231 i = w;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
232 }
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
233 ff_add_png_paeth_prediction(dst+i, src+i, last+i, size-i, bpp);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
234 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
235 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
236 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
237
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
238 static av_always_inline void convert_to_rgb32_loco(uint8_t *dst, const uint8_t *src, int width, int loco)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
239 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
240 int j;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
241 unsigned int r, g, b, a;
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 for(j = 0;j < width; j++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
244 r = src[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
245 g = src[1];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
246 b = src[2];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
247 a = src[3];
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
248 if(loco) {
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
249 r = (r+g)&0xff;
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
250 b = (b+g)&0xff;
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
251 }
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
252 *(uint32_t *)dst = (a << 24) | (r << 16) | (g << 8) | b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
253 dst += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
254 src += 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
255 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
256 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
257
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
258 static void convert_to_rgb32(uint8_t *dst, const uint8_t *src, int width, int loco)
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
259 {
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
260 if(loco)
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
261 convert_to_rgb32_loco(dst, src, width, 1);
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
262 else
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
263 convert_to_rgb32_loco(dst, src, width, 0);
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
264 }
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
265
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
266 static void deloco_rgb24(uint8_t *dst, int size)
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
267 {
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
268 int i;
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
269 for(i=0; i<size; i+=3) {
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
270 int g = dst[i+1];
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
271 dst[i+0] += g;
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
272 dst[i+2] += g;
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
273 }
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
274 }
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
275
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
276 /* process exactly one decompressed row */
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
277 static void png_handle_row(PNGDecContext *s)
2342
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 uint8_t *ptr, *last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
280 int got_line;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
281
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
282 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
283 ptr = s->image_buf + s->image_linesize * s->y;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
284 /* need to swap bytes correctly for RGB_ALPHA */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
285 if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
286 png_filter_row(&s->dsp, 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
287 s->last_row, s->row_size, s->bpp);
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
288 convert_to_rgb32(ptr, s->tmp_row, s->width, s->filter_type == PNG_FILTER_TYPE_LOCO);
6394
1a9af4a496f2 remove a memcpy
lorenm
parents: 6384
diff changeset
289 FFSWAP(uint8_t*, s->last_row, s->tmp_row);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
290 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
291 /* in normal case, we avoid one copy */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
292 if (s->y == 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
293 last_row = s->last_row;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
294 else
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
295 last_row = ptr - s->image_linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
296
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
297 png_filter_row(&s->dsp, ptr, s->crow_buf[0], s->crow_buf + 1,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
298 last_row, s->row_size, s->bpp);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
299 }
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
300 /* loco lags by 1 row so that it doesn't interfere with top prediction */
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
301 if (s->filter_type == PNG_FILTER_TYPE_LOCO &&
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
302 s->color_type == PNG_COLOR_TYPE_RGB && s->y > 0)
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
303 deloco_rgb24(ptr - s->image_linesize, s->row_size);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
304 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
305 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
306 s->state |= PNG_ALLIMAGE;
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
307 if (s->filter_type == PNG_FILTER_TYPE_LOCO &&
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
308 s->color_type == PNG_COLOR_TYPE_RGB)
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
309 deloco_rgb24(ptr, s->row_size);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
310 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
311 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
312 got_line = 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
313 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
314 ptr = s->image_buf + s->image_linesize * s->y;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
315 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
316 /* 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
317 wait for the next one */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
318 if (got_line)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
319 break;
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
320 png_filter_row(&s->dsp, 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
321 s->last_row, s->pass_row_size, s->bpp);
6394
1a9af4a496f2 remove a memcpy
lorenm
parents: 6384
diff changeset
322 FFSWAP(uint8_t*, s->last_row, s->tmp_row);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
323 got_line = 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
324 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
325 if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) {
4515
a2b14c6fccfd consistency renaming: rgba32 --> rgb32
diego
parents: 4494
diff changeset
326 /* NOTE: RGB32 is handled directly in png_put_interlaced_row */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
327 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
328 s->color_type, s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
329 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
330 s->y++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
331 if (s->y == s->height) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
332 for(;;) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
333 if (s->pass == NB_PASSES - 1) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
334 s->state |= PNG_ALLIMAGE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
335 goto the_end;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
336 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
337 s->pass++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
338 s->y = 0;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
339 s->pass_row_size = ff_png_pass_row_size(s->pass,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
340 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
341 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
342 s->crow_size = s->pass_row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
343 if (s->pass_row_size != 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
344 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
345 /* skip pass if empty row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
346 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
347 }
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 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
350 the_end: ;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
351 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
352 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
353
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
354 static int png_decode_idat(PNGDecContext *s, int length)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
355 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
356 int ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
357 s->zstream.avail_in = length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
358 s->zstream.next_in = s->bytestream;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
359 s->bytestream += length;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
360
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
361 if(s->bytestream > s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
362 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
363
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
364 /* decode one line if possible */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
365 while (s->zstream.avail_in > 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
366 ret = inflate(&s->zstream, Z_PARTIAL_FLUSH);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
367 if (ret != Z_OK && ret != Z_STREAM_END) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
368 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
369 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
370 if (s->zstream.avail_out == 0) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
371 if (!(s->state & PNG_ALLIMAGE)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
372 png_handle_row(s);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
373 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
374 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
375 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
376 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
377 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
378 return 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
379 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
380
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
381 static int decode_frame(AVCodecContext *avctx,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
382 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8629
diff changeset
383 AVPacket *avpkt)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
384 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8629
diff changeset
385 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8629
diff changeset
386 int buf_size = avpkt->size;
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
387 PNGDecContext * const s = avctx->priv_data;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
388 AVFrame *picture = data;
9387
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
389 AVFrame *p;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
390 uint32_t tag, length;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
391 int ret, crc;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
392
9387
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
393 FFSWAP(AVFrame *, s->current_picture, s->last_picture);
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
394 avctx->coded_frame= s->current_picture;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
395 p = s->current_picture;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
396
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
397 s->bytestream_start=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
398 s->bytestream= buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
399 s->bytestream_end= buf + buf_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
400
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
401 /* check signature */
6406
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
402 if (memcmp(s->bytestream, ff_pngsig, 8) != 0 &&
49dcfab1bda3 decode mng color decorrelation
lorenm
parents: 6394
diff changeset
403 memcmp(s->bytestream, ff_mngsig, 8) != 0)
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
404 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
405 s->bytestream+= 8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
406 s->y=
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
407 s->state=0;
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
408 // memset(s, 0, sizeof(PNGDecContext));
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
409 /* init the zlib */
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
410 s->zstream.zalloc = ff_png_zalloc;
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
411 s->zstream.zfree = ff_png_zfree;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
412 s->zstream.opaque = NULL;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
413 ret = inflateInit(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
414 if (ret != Z_OK)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
415 return -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
416 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
417 int tag32;
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
418 if (s->bytestream >= s->bytestream_end)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
419 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
420 length = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
421 if (length > 0x7fffffff)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
422 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
423 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
424 tag = bswap_32(tag32);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
425 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
426 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
427 (tag & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
428 ((tag >> 8) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
429 ((tag >> 16) & 0xff),
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
430 ((tag >> 24) & 0xff), length);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
431 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
432 switch(tag) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
433 case MKTAG('I', 'H', 'D', 'R'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
434 if (length != 13)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
435 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
436 s->width = bytestream_get_be32(&s->bytestream);
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
437 s->height = bytestream_get_be32(&s->bytestream);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
438 if(avcodec_check_dimensions(avctx, s->width, s->height)){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
439 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
440 goto fail;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2347
diff changeset
441 }
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
442 s->bit_depth = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
443 s->color_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
444 s->compression_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
445 s->filter_type = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
446 s->interlace_type = *s->bytestream++;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
447 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
448 s->state |= PNG_IHDR;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
449 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
450 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
451 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
452 s->compression_type, s->filter_type, s->interlace_type);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
453 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
454 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
455 case MKTAG('I', 'D', 'A', 'T'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
456 if (!(s->state & PNG_IHDR))
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 if (!(s->state & PNG_IDAT)) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
459 /* init image info */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
460 avctx->width = s->width;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
461 avctx->height = s->height;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
462
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
463 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
464 s->bits_per_pixel = s->bit_depth * s->channels;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
465 s->bpp = (s->bits_per_pixel + 7) >> 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
466 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
467
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
468 if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
469 s->color_type == PNG_COLOR_TYPE_RGB) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
470 avctx->pix_fmt = PIX_FMT_RGB24;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
471 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
472 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4379
diff changeset
473 avctx->pix_fmt = PIX_FMT_RGB32;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
474 } else if (s->bit_depth == 8 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
475 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
476 avctx->pix_fmt = PIX_FMT_GRAY8;
4067
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
477 } else if (s->bit_depth == 16 &&
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
478 s->color_type == PNG_COLOR_TYPE_GRAY) {
8ab58b7bc06b PNG 16-bit gray decoding support
kostya
parents: 4018
diff changeset
479 avctx->pix_fmt = PIX_FMT_GRAY16BE;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
480 } else if (s->bit_depth == 1 &&
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
481 s->color_type == PNG_COLOR_TYPE_GRAY) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
482 avctx->pix_fmt = PIX_FMT_MONOBLACK;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
483 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
484 avctx->pix_fmt = PIX_FMT_PAL8;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
485 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
486 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
487 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
488 if(p->data[0])
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
489 avctx->release_buffer(avctx, p);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
490
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
491 p->reference= 0;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
492 if(avctx->get_buffer(avctx, p) < 0){
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
493 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
494 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
495 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
496 p->pict_type= FF_I_TYPE;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
497 p->key_frame= 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
498 p->interlaced_frame = !!s->interlace_type;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
499
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
500 /* compute the compressed row size */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
501 if (!s->interlace_type) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
502 s->crow_size = s->row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
503 } else {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
504 s->pass = 0;
5337
26f4095e35d2 separate en/decoder specific parts from png.c
mru
parents: 5097
diff changeset
505 s->pass_row_size = ff_png_pass_row_size(s->pass,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
506 s->bits_per_pixel,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
507 s->width);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
508 s->crow_size = s->pass_row_size + 1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
509 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
510 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
511 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
512 s->row_size, s->crow_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
513 #endif
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
514 s->image_buf = p->data[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
515 s->image_linesize = p->linesize[0];
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
516 /* copy the palette if needed */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
517 if (s->color_type == PNG_COLOR_TYPE_PALETTE)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
518 memcpy(p->data[1], s->palette, 256 * sizeof(uint32_t));
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
519 /* empty row is used if differencing to the first row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
520 s->last_row = av_mallocz(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
521 if (!s->last_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
522 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
523 if (s->interlace_type ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
524 s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
525 s->tmp_row = av_malloc(s->row_size);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
526 if (!s->tmp_row)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
527 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
528 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
529 /* compressed row */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
530 s->crow_buf = av_malloc(s->row_size + 1);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
531 if (!s->crow_buf)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
532 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
533 s->zstream.avail_out = s->crow_size;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
534 s->zstream.next_out = s->crow_buf;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
535 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
536 s->state |= PNG_IDAT;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
537 if (png_decode_idat(s, length) < 0)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
538 goto fail;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
539 /* skip crc */
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
540 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
541 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
542 case MKTAG('P', 'L', 'T', 'E'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
543 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
544 int n, i, r, g, b;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2661
diff changeset
545
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
546 if ((length % 3) != 0 || length > 256 * 3)
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
547 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
548 /* read the palette */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
549 n = length / 3;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
550 for(i=0;i<n;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
551 r = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
552 g = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
553 b = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
554 s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
555 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
556 for(;i<256;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
557 s->palette[i] = (0xff << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
558 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
559 s->state |= PNG_PLTE;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
560 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
561 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
562 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
563 case MKTAG('t', 'R', 'N', 'S'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
564 {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
565 int v, i;
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 /* read the transparency. XXX: Only palette mode supported */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
568 if (s->color_type != PNG_COLOR_TYPE_PALETTE ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
569 length > 256 ||
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
570 !(s->state & PNG_PLTE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
571 goto skip_tag;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
572 for(i=0;i<length;i++) {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
573 v = *s->bytestream++;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
574 s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
575 }
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
576 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
577 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
578 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
579 case MKTAG('I', 'E', 'N', 'D'):
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
580 if (!(s->state & PNG_ALLIMAGE))
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
581 goto fail;
5067
6166fbf375cc Remove duplicate bytestream functions
ramiro
parents: 4515
diff changeset
582 crc = bytestream_get_be32(&s->bytestream);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
583 goto exit_loop;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
584 default:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
585 /* skip tag */
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
586 skip_tag:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
587 s->bytestream += length + 4;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
588 break;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
589 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
590 }
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
591 exit_loop:
9387
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
592 /* handle p-frames only if a predecessor frame is available */
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
593 if(s->last_picture->data[0] != NULL) {
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
594 if(!(avpkt->flags & PKT_FLAG_KEY)) {
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
595 int i, j;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
596 uint8_t *pd = s->current_picture->data[0];
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
597 uint8_t *pd_last = s->last_picture->data[0];
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
598
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
599 for(j=0; j < s->height; j++) {
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
600 for(i=0; i < s->width * s->bpp; i++) {
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
601 pd[i] += pd_last[i];
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
602 }
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
603 pd += s->image_linesize;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
604 pd_last += s->image_linesize;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
605 }
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
606 }
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
607 }
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
608
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
609 *picture= *s->current_picture;
7236
6c1244ad5620 Remove useless casts.
benoit
parents: 7040
diff changeset
610 *data_size = sizeof(AVFrame);
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
611
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
612 ret = s->bytestream - s->bytestream_start;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
613 the_end:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
614 inflateEnd(&s->zstream);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
615 av_freep(&s->crow_buf);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
616 av_freep(&s->last_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
617 av_freep(&s->tmp_row);
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
618 return ret;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
619 fail:
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
620 ret = -1;
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
621 goto the_end;
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
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6406
diff changeset
624 static av_cold int png_dec_init(AVCodecContext *avctx){
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
625 PNGDecContext *s = avctx->priv_data;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
626
9387
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
627 s->current_picture = &s->picture1;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
628 s->last_picture = &s->picture2;
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
629 avcodec_get_frame_defaults(&s->picture1);
cd207441ca56 Add support to CorePNG P-frames.
stefano
parents: 9355
diff changeset
630 avcodec_get_frame_defaults(&s->picture2);
6384
0a403ade8c81 simd and unroll png_filter_row
lorenm
parents: 6245
diff changeset
631 dsputil_init(&s->dsp, avctx);
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
632
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
633 return 0;
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
634 }
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
635
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
636 AVCodec png_decoder = {
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
637 "png",
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
638 CODEC_TYPE_VIDEO,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
639 CODEC_ID_PNG,
5339
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
640 sizeof(PNGDecContext),
a8c48a070cff hardly anything in PNGContext is shared; split it
mru
parents: 5337
diff changeset
641 png_dec_init,
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
642 NULL,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
643 NULL, //decode_end,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
644 decode_frame,
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
645 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
6722
6eeb19edcee3 Add long names to some AVCodec declarations.
diego
parents: 6517
diff changeset
646 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6722
diff changeset
647 .long_name = NULL_IF_CONFIG_SMALL("PNG image"),
2342
8b6668325ff8 porting png support from -f image to -f image2
michael
parents:
diff changeset
648 };