annotate tiff.c @ 10303:8a49525f2b1e libavcodec

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