annotate tiff.c @ 10296:a919d9583abd libavcodec

Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data, so replace it with custom code. This fixes issue 1419.
author kostya
date Sun, 27 Sep 2009 07:01:01 +0000
parents f9efc2bd005d
children a1654cd1b5b9
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
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8590
diff changeset
24 * @file libavcodec/tiff.c
4782
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"
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8491
diff changeset
28 #if CONFIG_ZLIB
4013
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"
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
33 #include "faxcompr.h"
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
34
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
35
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
36 typedef struct TiffContext {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
37 AVCodecContext *avctx;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
38 AVFrame picture;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
39
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
40 int width, height;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
41 unsigned int bpp;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
42 int le;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
43 int compr;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
44 int invert;
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
45 int fax_opts;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
46 int predictor;
10264
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
47 int fill_order;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
48
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
49 int strips, rps, sstype;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
50 int sot;
6256
michael
parents: 5962
diff changeset
51 const uint8_t* stripdata;
michael
parents: 5962
diff changeset
52 const uint8_t* stripsizes;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
53 int stripsize, stripoff;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
54 LZWState *lzw;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
55 } TiffContext;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
56
6256
michael
parents: 5962
diff changeset
57 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
58 int v = le ? AV_RL16(*p) : AV_RB16(*p);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
59 *p += 2;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
60 return v;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
61 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
62
6256
michael
parents: 5962
diff changeset
63 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
64 int v = le ? AV_RL32(*p) : AV_RB32(*p);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
65 *p += 4;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
66 return v;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
67 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
68
6256
michael
parents: 5962
diff changeset
69 static int tget(const uint8_t **p, int type, int le){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
70 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
71 case TIFF_BYTE : return *(*p)++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
72 case TIFF_SHORT: return tget_short(p, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
73 case TIFF_LONG : return tget_long (p, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
74 default : return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
75 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
76 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
77
10296
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
78 static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src, int size)
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
79 {
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
80 z_stream zstream;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
81 int zret;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
82
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
83 memset(&zstream, 0, sizeof(zstream));
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
84 zstream.next_in = src;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
85 zstream.avail_in = size;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
86 zstream.next_out = dst;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
87 zstream.avail_out = *len;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
88 zret = inflateInit(&zstream);
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
89 if (zret != Z_OK) {
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
90 av_log(NULL, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
91 return zret;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
92 }
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
93 zret = inflate(&zstream, Z_SYNC_FLUSH);
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
94 inflateEnd(&zstream);
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
95 *len = zstream.total_out;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
96 return zret == Z_STREAM_END ? Z_OK : zret;
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
97 }
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
98
6256
michael
parents: 5962
diff changeset
99 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
100 int c, line, pixels, code;
6256
michael
parents: 5962
diff changeset
101 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
102 int width = s->width * s->bpp >> 3;
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8491
diff changeset
103 #if CONFIG_ZLIB
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
104 uint8_t *zbuf; unsigned long outlen;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
105
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
106 if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){
10296
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
107 int ret;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
108 outlen = width * lines;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
109 zbuf = av_malloc(outlen);
10296
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
110 ret = tiff_uncompress(zbuf, &outlen, src, size);
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
111 if(ret != Z_OK){
a919d9583abd Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
kostya
parents: 10264
diff changeset
112 av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu) with error %d\n", outlen, (unsigned long)width * lines, ret);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
113 av_free(zbuf);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
114 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
115 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
116 src = zbuf;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
117 for(line = 0; line < lines; line++){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
118 memcpy(dst, src, width);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
119 dst += stride;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
120 src += width;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
121 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
122 av_free(zbuf);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
123 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
124 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
125 #endif
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
126 if(s->compr == TIFF_LZW){
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
127 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
128 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
129 return -1;
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
130 }
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
131 }
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
132 if(s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3 || s->compr == TIFF_G4){
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
133 int i, ret = 0;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
134 uint8_t *src2 = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
135
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
136 if(!src2 || (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE < (unsigned)size){
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
137 av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
138 return -1;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
139 }
10264
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
140 if(!s->fill_order){
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
141 memcpy(src2, src, size);
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
142 }else{
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
143 for(i = 0; i < size; i++)
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
144 src2[i] = ff_reverse[src[i]];
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
145 }
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
146 memset(src2+size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
147 if(s->compr == TIFF_G3 && !(s->fax_opts & 1))
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
148 s->compr = TIFF_CCITT_RLE;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
149 switch(s->compr){
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
150 case TIFF_CCITT_RLE:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
151 case TIFF_G3:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
152 case TIFF_G4:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
153 ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr);
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
154 break;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
155 }
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
156 av_free(src2);
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
157 return ret;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
158 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
159 for(line = 0; line < lines; line++){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
160 if(src - ssrc > size){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
161 av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
162 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
163 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
164 switch(s->compr){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
165 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
166 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
167 src += width;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
168 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
169 case TIFF_PACKBITS:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
170 for(pixels = 0; pixels < width;){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
171 code = (int8_t)*src++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
172 if(code >= 0){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
173 code++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
174 if(pixels + code > width){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
175 av_log(s->avctx, AV_LOG_ERROR, "Copy went out of bounds\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
176 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
177 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
178 memcpy(dst + pixels, src, code);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
179 src += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
180 pixels += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
181 }else if(code != -128){ // -127..-1
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
182 code = (-code) + 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
183 if(pixels + code > width){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
184 av_log(s->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
185 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
186 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
187 c = *src++;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
188 memset(dst + pixels, c, code);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
189 pixels += code;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
190 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
191 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
192 break;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
193 case TIFF_LZW:
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
194 pixels = ff_lzw_decode(s->lzw, dst, width);
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
195 if(pixels < width){
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
196 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
197 return -1;
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
198 }
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
199 break;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
200 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
201 dst += stride;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
202 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
203 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
204 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
205
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
206
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
207 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
208 {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
209 int tag, type, count, off, value = 0;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
210 int i, j;
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
211 uint32_t *pal;
6256
michael
parents: 5962
diff changeset
212 const uint8_t *rp, *gp, *bp;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
213
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
214 tag = tget_short(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
215 type = tget_short(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
216 count = tget_long(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
217 off = tget_long(&buf, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
218
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
219 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
220 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
221 case TIFF_BYTE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
222 case TIFF_SHORT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
223 buf -= 4;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
224 value = tget(&buf, type, s->le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
225 buf = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
226 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
227 case TIFF_LONG:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
228 value = off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
229 buf = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
230 break;
8366
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
231 case TIFF_STRING:
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
232 if(count <= 4){
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
233 buf -= 4;
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
234 break;
3bbfd02865d7 4l: TIFF stores short strings inside tag, do not interpret it is as an offset
kostya
parents: 7040
diff changeset
235 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
236 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
237 value = -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
238 buf = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
239 }
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
240 }else if(type_sizes[type] * count <= 4){
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
241 buf -= 4;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
242 }else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
243 buf = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
244 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
245
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
246 if(buf && (buf < start || buf > end_buf)){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
247 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
248 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
249 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
250
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
251 switch(tag){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
252 case TIFF_WIDTH:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
253 s->width = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
254 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
255 case TIFF_HEIGHT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
256 s->height = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
257 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
258 case TIFF_BPP:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
259 if(count == 1) s->bpp = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
260 else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
261 switch(type){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
262 case TIFF_BYTE:
4183
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
263 s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
264 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
265 case TIFF_SHORT:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
266 case TIFF_LONG:
4183
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
267 s->bpp = 0;
c70922cdf2ee Correctly detect 4-component images
kostya
parents: 4080
diff changeset
268 for(i = 0; i < count; i++) s->bpp += tget(&buf, type, s->le);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
269 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
270 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
271 s->bpp = -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
272 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
273 }
9784
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
274 if(count > 4){
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
275 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
276 return -1;
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
277 }
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
278 switch(s->bpp*10 + count){
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
279 case 11:
8427
2dfb0cc864b6 Add monochrome TIFF support
kostya
parents: 8426
diff changeset
280 s->avctx->pix_fmt = PIX_FMT_MONOBLACK;
2dfb0cc864b6 Add monochrome TIFF support
kostya
parents: 8426
diff changeset
281 break;
9784
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
282 case 81:
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
283 s->avctx->pix_fmt = PIX_FMT_PAL8;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
284 break;
9784
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
285 case 243:
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
286 s->avctx->pix_fmt = PIX_FMT_RGB24;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
287 break;
9784
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
288 case 161:
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
289 s->avctx->pix_fmt = PIX_FMT_GRAY16BE;
4193
cdefe220b007 Support for 16-bit grayscale
kostya
parents: 4192
diff changeset
290 break;
9784
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
291 case 324:
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
292 s->avctx->pix_fmt = PIX_FMT_RGBA;
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
293 break;
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
294 case 483:
2142607ddc2e Check combined depth and number of components in TIFF decoder, thus eliminating
kostya
parents: 9611
diff changeset
295 s->avctx->pix_fmt = s->le ? PIX_FMT_RGB48LE : PIX_FMT_RGB48BE;
9611
8074df653392 Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message
kostya
parents: 9553
diff changeset
296 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
297 default:
9611
8074df653392 Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message
kostya
parents: 9553
diff changeset
298 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
299 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
300 }
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
301 if(s->width != s->avctx->width || s->height != s->avctx->height){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
302 if(avcodec_check_dimensions(s->avctx, s->width, s->height))
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
303 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
304 avcodec_set_dimensions(s->avctx, s->width, s->height);
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
305 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
306 if(s->picture.data[0])
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
307 s->avctx->release_buffer(s->avctx, &s->picture);
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
308 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
309 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
310 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
311 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
312 if(s->bpp == 8){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
313 /* make default grayscale pal */
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
314 pal = (uint32_t *) s->picture.data[1];
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
315 for(i = 0; i < 256; i++)
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
316 pal[i] = i * 0x010101;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
317 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
318 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
319 case TIFF_COMPR:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
320 s->compr = value;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
321 s->predictor = 0;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
322 switch(s->compr){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
323 case TIFF_RAW:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
324 case TIFF_PACKBITS:
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
325 case TIFF_LZW:
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
326 case TIFF_CCITT_RLE:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
327 break;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
328 case TIFF_G3:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
329 case TIFF_G4:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
330 s->fax_opts = 0;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
331 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
332 case TIFF_DEFLATE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
333 case TIFF_ADOBE_DEFLATE:
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8491
diff changeset
334 #if CONFIG_ZLIB
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
335 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
336 #else
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
337 av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
338 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
339 #endif
4184
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
340 case TIFF_JPEG:
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
341 case TIFF_NEWJPEG:
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
342 av_log(s->avctx, AV_LOG_ERROR, "JPEG compression is not supported\n");
cfaa5d84641e Warn about JPEG in TIFF
kostya
parents: 4183
diff changeset
343 return -1;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
344 default:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
345 av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", s->compr);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
346 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
347 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
348 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
349 case TIFF_ROWSPERSTRIP:
8428
8bf9f50ed64f Some TIFFs declare -1 for the single strip height
kostya
parents: 8427
diff changeset
350 if(type == TIFF_LONG && value == -1)
8bf9f50ed64f Some TIFFs declare -1 for the single strip height
kostya
parents: 8427
diff changeset
351 value = s->avctx->height;
4185
7120f779d313 Rows per strip may be >= height
kostya
parents: 4184
diff changeset
352 if(value < 1){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
353 av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
354 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
355 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
356 s->rps = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
357 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
358 case TIFF_STRIP_OFFS:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
359 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
360 s->stripdata = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
361 s->stripoff = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
362 }else
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
363 s->stripdata = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
364 s->strips = count;
4405
48952197d91f Some TIFFs do not set rows per strip for single strip.
kostya
parents: 4364
diff changeset
365 if(s->strips == 1) s->rps = s->height;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
366 s->sot = type;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
367 if(s->stripdata > end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
368 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
369 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
370 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
371 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
372 case TIFF_STRIP_SIZE:
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
373 if(count == 1){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
374 s->stripsizes = NULL;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
375 s->stripsize = value;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
376 s->strips = 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
377 }else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
378 s->stripsizes = start + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
379 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
380 s->strips = count;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
381 s->sstype = type;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
382 if(s->stripsizes > end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
383 av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
384 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
385 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
386 break;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
387 case TIFF_PREDICTOR:
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
388 s->predictor = value;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
389 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
390 case TIFF_INVERT:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
391 switch(value){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
392 case 0:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
393 s->invert = 1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
394 break;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
395 case 1:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
396 s->invert = 0;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
397 break;
4187
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
398 case 2:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
399 case 3:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
400 break;
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
401 default:
46f12596304f Print error message for unsupported mode (RGB planar,CMYK,YCrCb)
kostya
parents: 4186
diff changeset
402 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
403 return -1;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
404 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
405 break;
10264
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
406 case TIFF_FILL_ORDER:
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
407 if(value < 1 || value > 2){
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
408 av_log(s->avctx, AV_LOG_ERROR, "Unknown FillOrder value %d, trying default one\n", value);
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
409 value = 1;
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
410 }
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
411 s->fill_order = value - 1;
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
412 break;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
413 case TIFF_PAL:
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
414 if(s->avctx->pix_fmt != PIX_FMT_PAL8){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
415 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
416 return -1;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
417 }
5261
d6957da94689 use correct type for palette
mru
parents: 5257
diff changeset
418 pal = (uint32_t *) s->picture.data[1];
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
419 off = type_sizes[type];
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
420 rp = buf;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
421 gp = buf + count / 3 * off;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
422 bp = buf + count / 3 * off * 2;
4190
405f8395eedc Use table for determining type sizes
kostya
parents: 4188
diff changeset
423 off = (type_sizes[type] - 1) << 3;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
424 for(i = 0; i < count / 3; i++){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
425 j = (tget(&rp, type, s->le) >> off) << 16;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
426 j |= (tget(&gp, type, s->le) >> off) << 8;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
427 j |= tget(&bp, type, s->le) >> off;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
428 pal[i] = j;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
429 }
4192
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
430 break;
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
431 case TIFF_PLANAR:
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
432 if(value == 2){
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
433 av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
434 return -1;
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
435 }
42e870000702 Give error about planar RGB
kostya
parents: 4191
diff changeset
436 break;
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
437 case TIFF_T4OPTIONS:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
438 case TIFF_T6OPTIONS:
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
439 s->fax_opts = value;
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
440 break;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
441 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
442 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
443 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
444
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
445 static int decode_frame(AVCodecContext *avctx,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
446 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
447 AVPacket *avpkt)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
448 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
449 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
450 int buf_size = avpkt->size;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
451 TiffContext * const s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
452 AVFrame *picture = data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
453 AVFrame * const p= (AVFrame*)&s->picture;
6256
michael
parents: 5962
diff changeset
454 const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
455 int id, le, off;
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
456 int i, j, entries;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
457 int stride, soff, ssize;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
458 uint8_t *dst;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
459
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
460 //parse image header
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4193
diff changeset
461 id = AV_RL16(buf); buf += 2;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
462 if(id == 0x4949) le = 1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
463 else if(id == 0x4D4D) le = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
464 else{
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
465 av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
466 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
467 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
468 s->le = le;
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
469 s->invert = 0;
5962
a6c9aa23d379 TIFF may omit compression tag.
kostya
parents: 5261
diff changeset
470 s->compr = TIFF_RAW;
10264
f9efc2bd005d Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
kostya
parents: 9812
diff changeset
471 s->fill_order = 0;
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
472 // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
473 // that further identifies the file as a TIFF file"
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
474 if(tget_short(&buf, le) != 42){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
475 av_log(avctx, AV_LOG_ERROR, "The answer to life, universe and everything is not correct!\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
476 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
477 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
478 /* parse image file directory */
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
479 off = tget_long(&buf, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
480 if(orig_buf + off + 14 >= end_buf){
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
481 av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
482 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
483 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
484 buf = orig_buf + off;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
485 entries = tget_short(&buf, le);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
486 for(i = 0; i < entries; i++){
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
487 if(tiff_decode_tag(s, orig_buf, buf, end_buf) < 0)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
488 return -1;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
489 buf += 12;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
490 }
8429
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
491 if(!s->stripdata && !s->stripoff){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
492 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
493 return -1;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
494 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
495 /* 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
496 if(!p->data[0]){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
497 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
498 return -1;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
499 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
500 if(s->strips == 1 && !s->stripsize){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
501 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
502 s->stripsize = buf_size - s->stripoff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
503 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
504 stride = p->linesize[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
505 dst = p->data[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
506 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
507 if(s->stripsizes)
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
508 ssize = tget(&s->stripsizes, s->sstype, s->le);
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
509 else
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
510 ssize = s->stripsize;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
511
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
512 if(s->stripdata){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
513 soff = tget(&s->stripdata, s->sot, s->le);
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
514 }else
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
515 soff = s->stripoff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
516 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
517 break;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
518 dst += s->rps * stride;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
519 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
520 if(s->predictor == 2){
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
521 dst = p->data[0];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
522 soff = s->bpp >> 3;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
523 ssize = s->width * soff;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
524 for(i = 0; i < s->height; i++) {
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
525 for(j = soff; j < ssize; j++)
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
526 dst[j] += dst[j - soff];
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
527 dst += stride;
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
528 }
b3ecaba81501 Decode TIFF image only after all tags have been decoded
kostya
parents: 8428
diff changeset
529 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
530
4186
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
531 if(s->invert){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
532 uint8_t *src;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
533 int j;
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
534
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
535 src = s->picture.data[0];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
536 for(j = 0; j < s->height; j++){
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
537 for(i = 0; i < s->picture.linesize[0]; i++)
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
538 src[i] = 255 - src[i];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
539 src += s->picture.linesize[0];
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
540 }
14fe1e8d337c 8-bit images support for TIFF
kostya
parents: 4185
diff changeset
541 }
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
542 *picture= *(AVFrame*)&s->picture;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
543 *data_size = sizeof(AVPicture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
544
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
545 return buf_size;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
546 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
547
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6256
diff changeset
548 static av_cold int tiff_init(AVCodecContext *avctx){
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
549 TiffContext *s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
550
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
551 s->width = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
552 s->height = 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
553 s->avctx = avctx;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
554 avcodec_get_frame_defaults((AVFrame*)&s->picture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
555 avctx->coded_frame= (AVFrame*)&s->picture;
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
556 ff_lzw_decode_open(&s->lzw);
8491
902c43f89d92 Enable faxcompr.
michael
parents: 8429
diff changeset
557 ff_ccitt_unpack_init();
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
558
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
559 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
560 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
561
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6256
diff changeset
562 static av_cold int tiff_end(AVCodecContext *avctx)
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
563 {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
564 TiffContext * const s = avctx->priv_data;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
565
4080
f426c81afc9e LZW decoder as separate module plus TIFF LZW support
kostya
parents: 4079
diff changeset
566 ff_lzw_decode_close(&s->lzw);
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
567 if(s->picture.data[0])
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
568 avctx->release_buffer(avctx, &s->picture);
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
569 return 0;
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
570 }
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
571
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
572 AVCodec tiff_decoder = {
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
573 "tiff",
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
574 CODEC_TYPE_VIDEO,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
575 CODEC_ID_TIFF,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
576 sizeof(TiffContext),
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
577 tiff_init,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
578 NULL,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
579 tiff_end,
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
580 decode_frame,
9812
58d29c191e5a tiff image decoder uses get_buffer, set CODEC_CAP_DR1
bcoudurier
parents: 9784
diff changeset
581 CODEC_CAP_DR1,
6722
6eeb19edcee3 Add long names to some AVCodec declarations.
diego
parents: 6517
diff changeset
582 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6722
diff changeset
583 .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
4013
aace6b74fddc TIFF decoder
kostya
parents:
diff changeset
584 };