annotate tiff.c @ 8440:649ce1b30344 libavcodec

Optimize 0 0 0-3 search, 45% faster on pentium dual.
author michael
date Tue, 23 Dec 2008 00:38:45 +0000
parents b3ecaba81501
children 902c43f89d92
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
1 /*
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
2 * TIFF image decoder
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
3 * Copyright (c) 2006 Konstantin Shishkov
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
4 *
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
5 * This file is part of FFmpeg.
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
6 *
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
11 *
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
15 * Lesser General Public License for more details.
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
16 *
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
20 */
4782
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
21
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
22 /**
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
23 * TIFF image decoder
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
24 * @file tiff.c
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
25 * @author Konstantin Shishkov
bca8924ed36c Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl.
diego
parents: 4774
diff changeset
26 */
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
27 #include "avcodec.h"
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
28 #ifdef CONFIG_ZLIB
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
29 #include <zlib.h>
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
30 #endif
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
31 #include "lzw.h"
4774
0860efc2f02b tiff encoder by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)
michael
parents: 4405
diff changeset
32 #include "tiff.h"
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
33
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
34
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
35 typedef struct TiffContext {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
36 AVCodecContext *avctx;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
37 AVFrame picture;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
38
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
39 int width, height;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
40 unsigned int bpp;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
41 int le;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
42 int compr;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
43 int invert;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
44 int predictor;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
45
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
46 int strips, rps, sstype;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
47 int sot;
6256
michael
parents: 5962
diff changeset
48 const uint8_t* stripdata;
michael
parents: 5962
diff changeset
49 const uint8_t* stripsizes;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
50 int stripsize, stripoff;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
51 LZWState *lzw;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
52 } TiffContext;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
53
6256
michael
parents: 5962
diff changeset
54 static int tget_short(const uint8_t **p, int le){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4193
diff changeset
55 int v = le ? AV_RL16(*p) : AV_RB16(*p);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
56 *p += 2;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
57 return v;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
58 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
59
6256
michael
parents: 5962
diff changeset
60 static int tget_long(const uint8_t **p, int le){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4193
diff changeset
61 int v = le ? AV_RL32(*p) : AV_RB32(*p);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
62 *p += 4;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
63 return v;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
64 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
65
6256
michael
parents: 5962
diff changeset
66 static int tget(const uint8_t **p, int type, int le){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
67 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
68 case TIFF_BYTE : return *(*p)++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
69 case TIFF_SHORT: return tget_short(p, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
70 case TIFF_LONG : return tget_long (p, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
71 default : return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
72 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
73 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
74
6256
michael
parents: 5962
diff changeset
75 static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uint8_t *src, int size, int lines){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
76 int c, line, pixels, code;
6256
michael
parents: 5962
diff changeset
77 const uint8_t *ssrc = src;
8426
898722eb4fd2 Calculate line size variable correctly for lower bitdepths and use it for raw data copying
kostya
parents: 8366
diff changeset
78 int width = s->width * s->bpp >> 3;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
79 #ifdef CONFIG_ZLIB
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
80 uint8_t *zbuf; unsigned long outlen;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
81
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
82 if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
83 outlen = width * lines;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
84 zbuf = av_malloc(outlen);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
85 if(uncompress(zbuf, &outlen, src, size) != Z_OK){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
86 av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu)\n", outlen, (unsigned long)width * lines);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
87 av_free(zbuf);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
88 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
89 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
90 src = zbuf;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
91 for(line = 0; line < lines; line++){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
92 memcpy(dst, src, width);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
93 dst += stride;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
94 src += width;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
95 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
96 av_free(zbuf);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
97 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
98 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
99 #endif
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
100 if(s->compr == TIFF_LZW){
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
101 if(ff_lzw_decode_init(s->lzw, 8, src, size, FF_LZW_TIFF) < 0){
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
102 av_log(s->avctx, AV_LOG_ERROR, "Error initializing LZW decoder\n");
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
103 return -1;
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
104 }
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
105 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
106 for(line = 0; line < lines; line++){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
107 if(src - ssrc > size){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
108 av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
109 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
110 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
111 switch(s->compr){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
112 case TIFF_RAW:
8426
898722eb4fd2 Calculate line size variable correctly for lower bitdepths and use it for raw data copying
kostya
parents: 8366
diff changeset
113 memcpy(dst, src, width);
898722eb4fd2 Calculate line size variable correctly for lower bitdepths and use it for raw data copying
kostya
parents: 8366
diff changeset
114 src += width;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
115 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
116 case TIFF_PACKBITS:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
117 for(pixels = 0; pixels < width;){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
118 code = (int8_t)*src++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
119 if(code >= 0){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
120 code++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
121 if(pixels + code > width){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
122 av_log(s->avctx, AV_LOG_ERROR, "Copy went out of bounds\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
123 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
124 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
125 memcpy(dst + pixels, src, code);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
126 src += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
127 pixels += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
128 }else if(code != -128){ // -127..-1
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
129 code = (-code) + 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
130 if(pixels + code > width){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
131 av_log(s->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
132 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
133 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
134 c = *src++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
135 memset(dst + pixels, c, code);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
136 pixels += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
137 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
138 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
139 break;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
140 case TIFF_LZW:
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
141 pixels = ff_lzw_decode(s->lzw, dst, width);
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
142 if(pixels < width){
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
143 av_log(s->avctx, AV_LOG_ERROR, "Decoded only %i bytes of %i\n", pixels, width);
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
144 return -1;
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
145 }
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
146 break;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
147 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
148 dst += stride;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
149 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
150 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
151 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
152
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
153
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
154 static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *buf, const uint8_t *end_buf)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
155 {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
156 int tag, type, count, off, value = 0;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
157 int i, j;
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
158 uint32_t *pal;
6256
michael
parents: 5962
diff changeset
159 const uint8_t *rp, *gp, *bp;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
160
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
161 tag = tget_short(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
162 type = tget_short(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
163 count = tget_long(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
164 off = tget_long(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
165
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
166 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
167 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
168 case TIFF_BYTE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
169 case TIFF_SHORT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
170 buf -= 4;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
171 value = tget(&buf, type, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
172 buf = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
173 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
174 case TIFF_LONG:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
175 value = off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
176 buf = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
177 break;
8366
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
178 case TIFF_STRING:
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
179 if(count <= 4){
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
180 buf -= 4;
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
181 break;
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
182 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
183 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
184 value = -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
185 buf = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
186 }
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
187 }else if(type_sizes[type] * count <= 4){
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
188 buf -= 4;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
189 }else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
190 buf = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
191 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
192
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
193 if(buf && (buf < start || buf > end_buf)){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
194 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
195 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
196 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
197
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
198 switch(tag){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
199 case TIFF_WIDTH:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
200 s->width = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
201 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
202 case TIFF_HEIGHT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
203 s->height = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
204 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
205 case TIFF_BPP:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
206 if(count == 1) s->bpp = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
207 else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
208 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
209 case TIFF_BYTE:
4183
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
210 s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
211 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
212 case TIFF_SHORT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
213 case TIFF_LONG:
4183
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
214 s->bpp = 0;
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
215 for(i = 0; i < count; i++) s->bpp += tget(&buf, type, s->le);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
216 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
217 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
218 s->bpp = -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
219 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
220 }
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
221 switch(s->bpp){
8427
2dfb0cc864b6 Add monochrome TIFF support
kostya
parents: 8426
diff changeset
222 case 1:
2dfb0cc864b6 Add monochrome TIFF support
kostya
parents: 8426
diff changeset
223 s->avctx->pix_fmt = PIX_FMT_MONOBLACK;
2dfb0cc864b6 Add monochrome TIFF support
kostya
parents: 8426
diff changeset
224 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
225 case 8:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
226 s->avctx->pix_fmt = PIX_FMT_PAL8;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
227 break;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
228 case 24:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
229 s->avctx->pix_fmt = PIX_FMT_RGB24;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
230 break;
4193
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
231 case 16:
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
232 if(count == 1){
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
233 s->avctx->pix_fmt = PIX_FMT_GRAY16BE;
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
234 }else{
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
235 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
236 return -1;
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
237 }
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
238 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
239 default:
4191
c9867abab7e6 Update error message
kostya
parents: 4190
diff changeset
240 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
241 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
242 }
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
243 if(s->width != s->avctx->width || s->height != s->avctx->height){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
244 if(avcodec_check_dimensions(s->avctx, s->width, s->height))
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
245 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
246 avcodec_set_dimensions(s->avctx, s->width, s->height);
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
247 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
248 if(s->picture.data[0])
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
249 s->avctx->release_buffer(s->avctx, &s->picture);
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
250 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
251 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
252 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
253 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
254 if(s->bpp == 8){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
255 /* make default grayscale pal */
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
256 pal = (uint32_t *) s->picture.data[1];
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
257 for(i = 0; i < 256; i++)
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
258 pal[i] = i * 0x010101;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
259 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
260 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
261 case TIFF_COMPR:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
262 s->compr = value;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
263 s->predictor = 0;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
264 switch(s->compr){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
265 case TIFF_RAW:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
266 case TIFF_PACKBITS:
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
267 case TIFF_LZW:
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
268 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
269 case TIFF_DEFLATE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
270 case TIFF_ADOBE_DEFLATE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
271 #ifdef CONFIG_ZLIB
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
272 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
273 #else
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
274 av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
275 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
276 #endif
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
277 case TIFF_G3:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
278 av_log(s->avctx, AV_LOG_ERROR, "CCITT G3 compression is not supported\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
279 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
280 case TIFF_G4:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
281 av_log(s->avctx, AV_LOG_ERROR, "CCITT G4 compression is not supported\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
282 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
283 case TIFF_CCITT_RLE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
284 av_log(s->avctx, AV_LOG_ERROR, "CCITT RLE compression is not supported\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
285 return -1;
4184
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
286 case TIFF_JPEG:
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
287 case TIFF_NEWJPEG:
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
288 av_log(s->avctx, AV_LOG_ERROR, "JPEG compression is not supported\n");
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
289 return -1;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
290 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
291 av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", s->compr);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
292 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
293 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
294 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
295 case TIFF_ROWSPERSTRIP:
8428
8bf9f50ed64f Some TIFFs declare -1 for the single strip height
kostya
parents: 8427
diff changeset
296 if(type == TIFF_LONG && value == -1)
8bf9f50ed64f Some TIFFs declare -1 for the single strip height
kostya
parents: 8427
diff changeset
297 value = s->avctx->height;
4185
7120f779d313 Rows per strip may be >= height
kostya
parents: 4184
diff changeset
298 if(value < 1){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
299 av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
300 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
301 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
302 s->rps = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
303 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
304 case TIFF_STRIP_OFFS:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
305 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
306 s->stripdata = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
307 s->stripoff = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
308 }else
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
309 s->stripdata = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
310 s->strips = count;
4405
48952197d91f Some TIFFs do not set rows per strip for single strip.
kostya
parents: 4364
diff changeset
311 if(s->strips == 1) s->rps = s->height;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
312 s->sot = type;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
313 if(s->stripdata > end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
314 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
315 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
316 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
317 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
318 case TIFF_STRIP_SIZE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
319 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
320 s->stripsizes = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
321 s->stripsize = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
322 s->strips = 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
323 }else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
324 s->stripsizes = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
325 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
326 s->strips = count;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
327 s->sstype = type;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
328 if(s->stripsizes > end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
329 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
330 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
331 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
332 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
333 case TIFF_PREDICTOR:
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
334 s->predictor = value;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
335 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
336 case TIFF_INVERT:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
337 switch(value){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
338 case 0:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
339 s->invert = 1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
340 break;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
341 case 1:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
342 s->invert = 0;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
343 break;
4187
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
344 case 2:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
345 case 3:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
346 break;
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
347 default:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
348 av_log(s->avctx, AV_LOG_ERROR, "Color mode %d is not supported\n", value);
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
349 return -1;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
350 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
351 break;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
352 case TIFF_PAL:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
353 if(s->avctx->pix_fmt != PIX_FMT_PAL8){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
354 av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
355 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
356 }
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
357 pal = (uint32_t *) s->picture.data[1];
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
358 off = type_sizes[type];
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
359 rp = buf;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
360 gp = buf + count / 3 * off;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
361 bp = buf + count / 3 * off * 2;
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
362 off = (type_sizes[type] - 1) << 3;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
363 for(i = 0; i < count / 3; i++){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
364 j = (tget(&rp, type, s->le) >> off) << 16;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
365 j |= (tget(&gp, type, s->le) >> off) << 8;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
366 j |= tget(&bp, type, s->le) >> off;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
367 pal[i] = j;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
368 }
4192
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
369 break;
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
370 case TIFF_PLANAR:
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
371 if(value == 2){
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
372 av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
373 return -1;
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
374 }
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
375 break;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
376 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
377 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
378 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
379
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
380 static int decode_frame(AVCodecContext *avctx,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
381 void *data, int *data_size,
6256
michael
parents: 5962
diff changeset
382 const uint8_t *buf, int buf_size)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
383 {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
384 TiffContext * const s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
385 AVFrame *picture = data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
386 AVFrame * const p= (AVFrame*)&s->picture;
6256
michael
parents: 5962
diff changeset
387 const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
388 int id, le, off;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
389 int i, j, entries;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
390 int stride, soff, ssize;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
391 uint8_t *dst;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
392
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
393 //parse image header
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4193
diff changeset
394 id = AV_RL16(buf); buf += 2;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
395 if(id == 0x4949) le = 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
396 else if(id == 0x4D4D) le = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
397 else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
398 av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
399 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
400 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
401 s->le = le;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
402 s->invert = 0;
5962
a6c9aa23d379 TIFF may omit compression tag.
kostya
parents: 5261
diff changeset
403 s->compr = TIFF_RAW;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
404 // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
405 // that further identifies the file as a TIFF file"
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
406 if(tget_short(&buf, le) != 42){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
407 av_log(avctx, AV_LOG_ERROR, "The answer to life, universe and everything is not correct!\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
408 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
409 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
410 /* parse image file directory */
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
411 off = tget_long(&buf, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
412 if(orig_buf + off + 14 >= end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
413 av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
414 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
415 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
416 buf = orig_buf + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
417 entries = tget_short(&buf, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
418 for(i = 0; i < entries; i++){
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
419 if(tiff_decode_tag(s, orig_buf, buf, end_buf) < 0)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
420 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
421 buf += 12;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
422 }
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
423 if(!s->stripdata && !s->stripoff){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
424 av_log(avctx, AV_LOG_ERROR, "Image data is missing\n");
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
425 return -1;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
426 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
427 /* now we have the data and may start decoding */
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
428 if(!p->data[0]){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
429 av_log(s->avctx, AV_LOG_ERROR, "Picture initialization missing\n");
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
430 return -1;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
431 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
432 if(s->strips == 1 && !s->stripsize){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
433 av_log(avctx, AV_LOG_WARNING, "Image data size missing\n");
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
434 s->stripsize = buf_size - s->stripoff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
435 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
436 stride = p->linesize[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
437 dst = p->data[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
438 for(i = 0; i < s->height; i += s->rps){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
439 if(s->stripsizes)
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
440 ssize = tget(&s->stripsizes, s->sstype, s->le);
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
441 else
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
442 ssize = s->stripsize;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
443
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
444 if(s->stripdata){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
445 soff = tget(&s->stripdata, s->sot, s->le);
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
446 }else
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
447 soff = s->stripoff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
448 if(tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize, FFMIN(s->rps, s->height - i)) < 0)
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
449 break;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
450 dst += s->rps * stride;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
451 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
452 if(s->predictor == 2){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
453 dst = p->data[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
454 soff = s->bpp >> 3;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
455 ssize = s->width * soff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
456 for(i = 0; i < s->height; i++) {
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
457 for(j = soff; j < ssize; j++)
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
458 dst[j] += dst[j - soff];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
459 dst += stride;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
460 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
461 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
462
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
463 if(s->invert){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
464 uint8_t *src;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
465 int j;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
466
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
467 src = s->picture.data[0];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
468 for(j = 0; j < s->height; j++){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
469 for(i = 0; i < s->picture.linesize[0]; i++)
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
470 src[i] = 255 - src[i];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
471 src += s->picture.linesize[0];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
472 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
473 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
474 *picture= *(AVFrame*)&s->picture;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
475 *data_size = sizeof(AVPicture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
476
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
477 return buf_size;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
478 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
479
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6256
diff changeset
480 static av_cold int tiff_init(AVCodecContext *avctx){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
481 TiffContext *s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
482
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
483 s->width = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
484 s->height = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
485 s->avctx = avctx;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
486 avcodec_get_frame_defaults((AVFrame*)&s->picture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
487 avctx->coded_frame= (AVFrame*)&s->picture;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
488 s->picture.data[0] = NULL;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
489 ff_lzw_decode_open(&s->lzw);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
490
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
491 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
492 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
493
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6256
diff changeset
494 static av_cold int tiff_end(AVCodecContext *avctx)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
495 {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
496 TiffContext * const s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
497
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
498 ff_lzw_decode_close(&s->lzw);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
499 if(s->picture.data[0])
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
500 avctx->release_buffer(avctx, &s->picture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
501 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
502 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
503
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
504 AVCodec tiff_decoder = {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
505 "tiff",
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
506 CODEC_TYPE_VIDEO,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
507 CODEC_ID_TIFF,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
508 sizeof(TiffContext),
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
509 tiff_init,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
510 NULL,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
511 tiff_end,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
512 decode_frame,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
513 0,
6722
6eeb19edcee3 Add long names to some AVCodec declarations.
diego
parents: 6517
diff changeset
514 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6722
diff changeset
515 .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
516 };