annotate tiff.c @ 12530:63edd10ad4bc libavcodec tip

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