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

tiff: planar rgb 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-05-09 19:39:32 +00:00
parent 09d6beee24
commit 379ad9788b
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/tiff.c
View File

@ -52,6 +52,7 @@ typedef struct TiffContext {
int le; int le;
enum TiffCompr compr; enum TiffCompr compr;
int invert; int invert;
int planar;
int fax_opts; int fax_opts;
int predictor; int predictor;
int fill_order; int fill_order;
@ -431,6 +432,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
const uint8_t *ssrc = src; const uint8_t *ssrc = src;
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;
@ -617,22 +621,24 @@ static int init_image(TiffContext *s, AVFrame *frame)
s->avctx->pix_fmt = AV_PIX_FMT_PAL8; s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
break; break;
case 243: case 243:
s->avctx->pix_fmt = AV_PIX_FMT_RGB24; s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRP : AV_PIX_FMT_RGB24;
break; break;
case 161: case 161:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE; s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
break; break;
case 162: case 162:
s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A; s->avctx->pix_fmt = s>planar ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAY8A;
break; break;
case 324: case 324:
s->avctx->pix_fmt = AV_PIX_FMT_RGBA; s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA;
break; break;
case 483: case 483:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE; s->avctx->pix_fmt = s->planar ? (s->le ? AV_PIX_FMT_GBRP16LE : AV_PIX_FMT_GBRP16BE) :
(s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE);
break; break;
case 644: case 644:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE; s->avctx->pix_fmt = s->planar ? (s->le ? AV_PIX_FMT_GBRAP16LE : AV_PIX_FMT_GBRAP16BE) :
(s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE);
break; break;
default: default:
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
@ -884,10 +890,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->palette_is_set = 1; s->palette_is_set = 1;
break; break;
case TIFF_PLANAR: case TIFF_PLANAR:
if (value == 2) { s->planar = value == 2;
av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
return AVERROR_PATCHWELCOME;
}
break; break;
case TIFF_T4OPTIONS: case TIFF_T4OPTIONS:
if (s->compr == TIFF_G3) if (s->compr == TIFF_G3)
@ -1042,7 +1045,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; int i, j, entries;
int stride; int stride;
unsigned soff, ssize; unsigned soff, ssize;
@ -1125,8 +1128,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 >= (unsigned)avpkt->size) if (s->stripsizesoff >= (unsigned)avpkt->size)
@ -1144,6 +1145,10 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
planes = s->planar ? s->bppcount : 1;
for (plane = 0; plane < planes; plane++) {
stride = p->linesize[plane];
dst = p->data[plane];
for (i = 0; i < s->height; i += s->rps) { for (i = 0; i < s->height; i += s->rps) {
if (s->stripsizesoff) if (s->stripsizesoff)
ssize = tget(&stripsizes, s->sstype, s->le); ssize = tget(&stripsizes, s->sstype, s->le);
@ -1165,7 +1170,7 @@ static int decode_frame(AVCodecContext *avctx,
dst += s->rps * stride; dst += s->rps * stride;
} }
if (s->predictor == 2) { if (s->predictor == 2) {
dst = p->data[0]; dst = p->data[plane];
soff = s->bpp >> 3; soff = s->bpp >> 3;
ssize = s->width * soff; ssize = s->width * soff;
if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE ||
@ -1192,13 +1197,22 @@ static int decode_frame(AVCodecContext *avctx,
} }
if (s->invert) { if (s->invert) {
dst = p->data[0]; dst = p->data[plane];
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
for (j = 0; j < p->linesize[0]; j++) for (j = 0; j < p->linesize[plane]; j++)
dst[j] = (s->avctx->pix_fmt == AV_PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j]; dst[j] = (s->avctx->pix_fmt == AV_PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j];
dst += p->linesize[0]; dst += p->linesize[plane];
} }
} }
}
if (s->planar && s->bpp_count > 2) {
FFSWAP(uint8_t*, p->data[0], p->data[2]);
FFSWAP(int, p->linesize[0], p->linesize[2]);
FFSWAP(uint8_t*, p->data[0], p->data[1]);
FFSWAP(int, p->linesize[0], p->linesize[1]);
}
*got_frame = 1; *got_frame = 1;
return avpkt->size; return avpkt->size;