TIFF_STRIP_OFFS = 0x111,
TIFF_ROWSPERSTRIP = 0x116,
TIFF_STRIP_SIZE,
+ TIFF_PLANAR = 0x11C,
TIFF_XPOS = 0x11E,
TIFF_YPOS = 0x11F,
- TIFF_PREDICTOR = 0x13D
+ TIFF_PREDICTOR = 0x13D,
+ TIFF_PAL = 0x140
};
enum TiffCompr{
TIFF_LONGLONG
};
+/** sizes of various TIFF field types */
+static const int type_sizes[6] = {
+ 0, 1, 100, 2, 4, 8
+};
+
typedef struct TiffContext {
AVCodecContext *avctx;
AVFrame picture;
unsigned int bpp;
int le;
int compr;
+ int invert;
int strips, rps;
int sot;
if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){
outlen = width * lines;
- if(lines != s->height){
- av_log(s->avctx, AV_LOG_ERROR, "This decoder won't decode ZLib-packed TIFF with %i lines per strip\n", lines);
- return -1;
- }
zbuf = av_malloc(outlen);
if(uncompress(zbuf, &outlen, src, size) != Z_OK){
av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu)\n", outlen, (unsigned long)width * lines);
int tag, type, count, off, value = 0;
uint8_t *src, *dst;
int i, j, ssize, soff, stride;
+ int *pal, *rp, *gp, *bp;
tag = tget_short(&buf, s->le);
type = tget_short(&buf, s->le);
value = -1;
buf = start + off;
}
+ }else if(type_sizes[type] * count <= 4){
+ buf -= 4;
}else{
buf = start + off;
}
break;
case TIFF_HEIGHT:
s->height = value;
- s->avctx->pix_fmt = PIX_FMT_RGB24;
- if(s->width != s->avctx->width || s->height != s->avctx->height){
- if(avcodec_check_dimensions(s->avctx, s->width, s->height))
- return -1;
- avcodec_set_dimensions(s->avctx, s->width, s->height);
- }
- if(s->picture.data[0])
- s->avctx->release_buffer(s->avctx, &s->picture);
- if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
break;
case TIFF_BPP:
if(count == 1) s->bpp = value;
s->bpp = -1;
}
}
- if(s->bpp != 24){
- av_log(s->avctx, AV_LOG_ERROR, "Only RGB24 is supported\n");
+ switch(s->bpp){
+ case 8:
+ s->avctx->pix_fmt = PIX_FMT_PAL8;
+ break;
+ case 24:
+ s->avctx->pix_fmt = PIX_FMT_RGB24;
+ break;
+ case 16:
+ if(count == 1){
+ s->avctx->pix_fmt = PIX_FMT_GRAY16BE;
+ }else{
+ av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
+ return -1;
+ }
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
+ return -1;
+ }
+ if(s->width != s->avctx->width || s->height != s->avctx->height){
+ if(avcodec_check_dimensions(s->avctx, s->width, s->height))
+ return -1;
+ avcodec_set_dimensions(s->avctx, s->width, s->height);
+ }
+ if(s->picture.data[0])
+ s->avctx->release_buffer(s->avctx, &s->picture);
+ if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
+ if(s->bpp == 8){
+ /* make default grayscale pal */
+ pal = s->picture.data[1];
+ for(i = 0; i < 256; i++)
+ pal[i] = i * 0x010101;
+ }
break;
case TIFF_COMPR:
s->compr = value;
case TIFF_CCITT_RLE:
av_log(s->avctx, AV_LOG_ERROR, "CCITT RLE compression is not supported\n");
return -1;
+ case TIFF_JPEG:
+ case TIFF_NEWJPEG:
+ av_log(s->avctx, AV_LOG_ERROR, "JPEG compression is not supported\n");
+ return -1;
default:
av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", s->compr);
return -1;
}
break;
case TIFF_ROWSPERSTRIP:
- if(value < 1 || value > s->height){
+ if(value < 1){
av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
return -1;
}
}
}
break;
+ case TIFF_INVERT:
+ switch(value){
+ case 0:
+ s->invert = 1;
+ break;
+ case 1:
+ s->invert = 0;
+ break;
+ case 2:
+ case 3:
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR, "Color mode %d is not supported\n", value);
+ return -1;
+ }
+ break;
+ case TIFF_PAL:
+ if(s->avctx->pix_fmt != PIX_FMT_PAL8){
+ av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
+ return -1;
+ }
+ pal = s->picture.data[1];
+ off = type_sizes[type];
+ rp = buf;
+ gp = buf + count / 3 * off;
+ bp = buf + count / 3 * off * 2;
+ off = (type_sizes[type] - 1) << 3;
+ for(i = 0; i < count / 3; i++){
+ j = (tget(&rp, type, s->le) >> off) << 16;
+ j |= (tget(&gp, type, s->le) >> off) << 8;
+ j |= tget(&bp, type, s->le) >> off;
+ pal[i] = j;
+ }
+ break;
+ case TIFF_PLANAR:
+ if(value == 2){
+ av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
+ return -1;
+ }
+ break;
}
return 0;
}
return -1;
}
s->le = le;
+ s->invert = 0;
// As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
// that further identifies the file as a TIFF file"
if(tget_short(&buf, le) != 42){
buf += 12;
}
+ if(s->invert){
+ uint8_t *src;
+ int j;
+
+ src = s->picture.data[0];
+ for(j = 0; j < s->height; j++){
+ for(i = 0; i < s->picture.linesize[0]; i++)
+ src[i] = 255 - src[i];
+ src += s->picture.linesize[0];
+ }
+ }
*picture= *(AVFrame*)&s->picture;
*data_size = sizeof(AVPicture);