RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tiff: support decoding GBRP and GBRAP formats 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Paul B Mahol 2014-12-17 14:54:44 +01:00 committed by Vittorio Giovara
parent 928061670e
commit f86f39cb9b
1 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
libavcodec/tiff.c
View File

@ -52,6 +52,7 @@ typedef struct TiffContext {
int le; int le;
enum TiffCompr compr; enum TiffCompr compr;
enum TiffPhotometric photometric; enum TiffPhotometric photometric;
int planar;
int fax_opts; int fax_opts;
int predictor; int predictor;
int fill_order; int fill_order;
@ -172,6 +173,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
int c, line, pixels, code, ret; int c, line, pixels, code, ret;
int width = ((s->width * s->bpp) + 7) >> 3; int width = ((s->width * s->bpp) + 7) >> 3;
if (s->planar)
width /= s->bppcount;
if (size <= 0) if (size <= 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -248,7 +252,7 @@ static int init_image(TiffContext *s, AVFrame *frame)
{ {
int ret; int ret;
switch (s->bpp * 10 + s->bppcount) { switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) {
case 11: case 11:
s->avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; s->avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
break; break;
@ -276,6 +280,18 @@ static int init_image(TiffContext *s, AVFrame *frame)
case 644: case 644:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE; s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE;
break; break;
case 1243:
s->avctx->pix_fmt = AV_PIX_FMT_GBRP;
break;
case 1324:
s->avctx->pix_fmt = AV_PIX_FMT_GBRAP;
break;
case 1483:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GBRP16LE : AV_PIX_FMT_GBRP16BE;
break;
case 1644:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GBRAP16LE : AV_PIX_FMT_GBRAP16BE;
break;
default: default:
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"This format is not supported (bpp=%d, bppcount=%d)\n", "This format is not supported (bpp=%d, bppcount=%d)\n",
@ -507,10 +523,7 @@ static int tiff_decode_tag(TiffContext *s)
break; break;
} }
case TIFF_PLANAR: case TIFF_PLANAR:
if (value == 2) { s->planar = value == 2;
avpriv_report_missing_feature(s->avctx, "Planar format");
return AVERROR_PATCHWELCOME;
}
break; break;
case TIFF_T4OPTIONS: case TIFF_T4OPTIONS:
if (s->compr == TIFF_G3) if (s->compr == TIFF_G3)
@ -538,7 +551,7 @@ static int decode_frame(AVCodecContext *avctx,
TiffContext *const s = avctx->priv_data; TiffContext *const s = avctx->priv_data;
AVFrame *const p = data; AVFrame *const p = data;
unsigned off; unsigned off;
int id, le, ret; int id, le, ret, plane, planes;
int i, j, entries, stride; int i, j, entries, stride;
unsigned soff, ssize; unsigned soff, ssize;
uint8_t *dst; uint8_t *dst;
@ -596,8 +609,6 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_WARNING, "Image data size missing\n"); av_log(avctx, AV_LOG_WARNING, "Image data size missing\n");
s->stripsize = avpkt->size - s->stripoff; s->stripsize = avpkt->size - s->stripoff;
} }
stride = p->linesize[0];
dst = p->data[0];
if (s->stripsizesoff) { if (s->stripsizesoff) {
if (s->stripsizesoff >= avpkt->size) if (s->stripsizesoff >= avpkt->size)
@ -612,64 +623,77 @@ static int decode_frame(AVCodecContext *avctx,
avpkt->size - s->strippos); avpkt->size - s->strippos);
} }
for (i = 0; i < s->height; i += s->rps) { planes = s->planar ? s->bppcount : 1;
if (s->stripsizesoff) for (plane = 0; plane < planes; plane++) {
ssize = tget(&stripsizes, s->sstype, le); stride = p->linesize[plane];
else dst = p->data[plane];
ssize = s->stripsize; for (i = 0; i < s->height; i += s->rps) {
if (s->stripsizesoff)
ssize = tget(&stripsizes, s->sstype, le);
else
ssize = s->stripsize;
if (s->strippos) if (s->strippos)
soff = tget(&stripdata, s->sot, le); soff = tget(&stripdata, s->sot, le);
else else
soff = s->stripoff; soff = s->stripoff;
if (soff > avpkt->size || ssize > avpkt->size - soff) { if (soff > avpkt->size || ssize > avpkt->size - soff) {
av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n"); av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
if ((ret = tiff_unpack_strip(s, dst, stride, avpkt->data + soff, ssize,
FFMIN(s->rps, s->height - i))) < 0) {
if (avctx->err_recognition & AV_EF_EXPLODE)
return ret;
break;
}
dst += s->rps * stride;
}
if (s->predictor == 2) {
dst = p->data[0];
soff = s->bpp >> 3;
ssize = s->width * soff;
if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE ||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) {
for (i = 0; i < s->height; i++) {
for (j = soff; j < ssize; j += 2)
AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff));
dst += stride;
} }
} else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE || if ((ret = tiff_unpack_strip(s, dst, stride, avpkt->data + soff, ssize,
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) { FFMIN(s->rps, s->height - i))) < 0) {
for (i = 0; i < s->height; i++) { if (avctx->err_recognition & AV_EF_EXPLODE)
for (j = soff; j < ssize; j += 2) return ret;
AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); break;
dst += stride;
} }
} else { dst += s->rps * stride;
}
if (s->predictor == 2) {
dst = p->data[plane];
soff = s->bpp >> 3;
ssize = s->width * soff;
if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE ||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) {
for (i = 0; i < s->height; i++) {
for (j = soff; j < ssize; j += 2)
AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff));
dst += stride;
}
} else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE ||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) {
for (i = 0; i < s->height; i++) {
for (j = soff; j < ssize; j += 2)
AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff));
dst += stride;
}
} else {
for (i = 0; i < s->height; i++) {
for (j = soff; j < ssize; j++)
dst[j] += dst[j - soff];
dst += stride;
}
}
}
if (s->photometric == TIFF_PHOTOMETRIC_WHITE_IS_ZERO) {
dst = p->data[plane];
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
for (j = soff; j < ssize; j++) for (j = 0; j < stride; j++)
dst[j] += dst[j - soff]; dst[j] = 255 - dst[j];
dst += stride; dst += stride;
} }
} }
} }
if (s->photometric == TIFF_PHOTOMETRIC_WHITE_IS_ZERO) { if (s->planar && s->bppcount > 2) {
dst = p->data[0]; FFSWAP(uint8_t*, p->data[0], p->data[2]);
for (i = 0; i < s->height; i++) { FFSWAP(int, p->linesize[0], p->linesize[2]);
for (j = 0; j < p->linesize[0]; j++) FFSWAP(uint8_t*, p->data[0], p->data[1]);
dst[j] = 255 - dst[j]; FFSWAP(int, p->linesize[0], p->linesize[1]);
dst += stride;
}
} }
*got_frame = 1; *got_frame = 1;
return avpkt->size; return avpkt->size;