mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/tiff: Support yuv 420 and 444
Fixes Ticket416 Trolled-by: jb Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
1ca21e1b76
commit
d03defa778
|
@ -68,6 +68,8 @@ typedef struct TiffContext {
|
||||||
|
|
||||||
uint8_t *deinvert_buf;
|
uint8_t *deinvert_buf;
|
||||||
int deinvert_buf_size;
|
int deinvert_buf_size;
|
||||||
|
uint8_t *yuv_line;
|
||||||
|
unsigned int yuv_line_size;
|
||||||
|
|
||||||
int geotag_count;
|
int geotag_count;
|
||||||
TiffGeoTag *geotags;
|
TiffGeoTag *geotags;
|
||||||
|
@ -381,13 +383,43 @@ static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
static void unpack_yuv(TiffContext *s, AVFrame *p,
|
||||||
const uint8_t *src, int size, int lines)
|
const uint8_t *src, int lnum)
|
||||||
|
{
|
||||||
|
int i, j, k;
|
||||||
|
int w = (s->width - 1) / s->subsampling[0] + 1;
|
||||||
|
uint8_t *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]];
|
||||||
|
uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]];
|
||||||
|
if (s->width % s->subsampling[0] || s->height % s->subsampling[1]) {
|
||||||
|
for (i = 0; i < w; i++) {
|
||||||
|
for (j = 0; j < s->subsampling[1]; j++)
|
||||||
|
for (k = 0; k < s->subsampling[0]; k++)
|
||||||
|
p->data[0][FFMIN(lnum + j, s->height-1) * p->linesize[0] +
|
||||||
|
FFMIN(i * s->subsampling[0] + k, s->width-1)] = *src++;
|
||||||
|
*pu++ = *src++;
|
||||||
|
*pv++ = *src++;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
for (i = 0; i < w; i++) {
|
||||||
|
for (j = 0; j < s->subsampling[1]; j++)
|
||||||
|
for (k = 0; k < s->subsampling[0]; k++)
|
||||||
|
p->data[0][(lnum + j) * p->linesize[0] +
|
||||||
|
i * s->subsampling[0] + k] = *src++;
|
||||||
|
*pu++ = *src++;
|
||||||
|
*pv++ = *src++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int stride,
|
||||||
|
const uint8_t *src, int size, int strip_start, int lines)
|
||||||
{
|
{
|
||||||
PutByteContext pb;
|
PutByteContext pb;
|
||||||
int c, line, pixels, code, ret;
|
int c, line, pixels, code, ret;
|
||||||
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;
|
||||||
|
int is_yuv = s->photometric == TIFF_PHOTOMETRIC_YCBCR;
|
||||||
|
|
||||||
if (s->planar)
|
if (s->planar)
|
||||||
width /= s->bppcount;
|
width /= s->bppcount;
|
||||||
|
@ -395,7 +427,26 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
if (is_yuv) {
|
||||||
|
int bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp *
|
||||||
|
s->subsampling[0] * s->subsampling[1] + 7) >> 3;
|
||||||
|
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row);
|
||||||
|
if (s->yuv_line == NULL) {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n");
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
}
|
||||||
|
dst = s->yuv_line;
|
||||||
|
stride = 0;
|
||||||
|
width = s->width * s->subsampling[1] + 2*(s->width / s->subsampling[0]);
|
||||||
|
av_assert0(width <= bytes_per_row);
|
||||||
|
av_assert0(s->bpp == 24);
|
||||||
|
}
|
||||||
|
|
||||||
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
|
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
|
||||||
|
if (is_yuv) {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR, "YUV deflate is unsupported");
|
||||||
|
return AVERROR_PATCHWELCOME;
|
||||||
|
}
|
||||||
#if CONFIG_ZLIB
|
#if CONFIG_ZLIB
|
||||||
return tiff_unpack_zlib(s, dst, stride, src, size, width, lines);
|
return tiff_unpack_zlib(s, dst, stride, src, size, width, lines);
|
||||||
#else
|
#else
|
||||||
|
@ -427,6 +478,10 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||||
}
|
}
|
||||||
if (s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8)
|
if (s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8)
|
||||||
horizontal_fill(s->bpp, dst, 1, dst, 0, width, 0);
|
horizontal_fill(s->bpp, dst, 1, dst, 0, width, 0);
|
||||||
|
if (is_yuv) {
|
||||||
|
unpack_yuv(s, p, dst, strip_start + line);
|
||||||
|
line += s->subsampling[1] - 1;
|
||||||
|
}
|
||||||
dst += stride;
|
dst += stride;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -434,11 +489,14 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||||
if (s->compr == TIFF_CCITT_RLE ||
|
if (s->compr == TIFF_CCITT_RLE ||
|
||||||
s->compr == TIFF_G3 ||
|
s->compr == TIFF_G3 ||
|
||||||
s->compr == TIFF_G4) {
|
s->compr == TIFF_G4) {
|
||||||
|
if (is_yuv)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
return tiff_unpack_fax(s, dst, stride, src, size, width, lines);
|
return tiff_unpack_fax(s, dst, stride, src, size, width, lines);
|
||||||
}
|
}
|
||||||
|
|
||||||
bytestream2_init(&s->gb, src, size);
|
bytestream2_init(&s->gb, src, size);
|
||||||
bytestream2_init_writer(&pb, dst, stride * lines);
|
bytestream2_init_writer(&pb, dst, is_yuv ? s->yuv_line_size : (stride * lines));
|
||||||
|
|
||||||
for (line = 0; line < lines; line++) {
|
for (line = 0; line < lines; line++) {
|
||||||
if (src - ssrc > size) {
|
if (src - ssrc > size) {
|
||||||
|
@ -503,6 +561,10 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (is_yuv) {
|
||||||
|
unpack_yuv(s, p, dst, strip_start + line);
|
||||||
|
line += s->subsampling[1] - 1;
|
||||||
|
}
|
||||||
dst += stride;
|
dst += stride;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -525,6 +587,16 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
|
||||||
s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||||
break;
|
break;
|
||||||
case 243:
|
case 243:
|
||||||
|
if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) {
|
||||||
|
if (s->subsampling[0] == 1 && s->subsampling[1] == 1) {
|
||||||
|
s->avctx->pix_fmt = AV_PIX_FMT_YUV444P;
|
||||||
|
} else if (s->subsampling[0] == 2 && s->subsampling[1] == 2) {
|
||||||
|
s->avctx->pix_fmt = AV_PIX_FMT_YUV420P;
|
||||||
|
} else {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR, "Unsupported YCbCr subsampling\n");
|
||||||
|
return AVERROR_PATCHWELCOME;
|
||||||
|
}
|
||||||
|
} else
|
||||||
s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
||||||
break;
|
break;
|
||||||
case 161:
|
case 161:
|
||||||
|
@ -750,11 +822,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
||||||
case TIFF_PHOTOMETRIC_BLACK_IS_ZERO:
|
case TIFF_PHOTOMETRIC_BLACK_IS_ZERO:
|
||||||
case TIFF_PHOTOMETRIC_RGB:
|
case TIFF_PHOTOMETRIC_RGB:
|
||||||
case TIFF_PHOTOMETRIC_PALETTE:
|
case TIFF_PHOTOMETRIC_PALETTE:
|
||||||
|
case TIFF_PHOTOMETRIC_YCBCR:
|
||||||
s->photometric = value;
|
s->photometric = value;
|
||||||
break;
|
break;
|
||||||
case TIFF_PHOTOMETRIC_ALPHA_MASK:
|
case TIFF_PHOTOMETRIC_ALPHA_MASK:
|
||||||
case TIFF_PHOTOMETRIC_SEPARATED:
|
case TIFF_PHOTOMETRIC_SEPARATED:
|
||||||
case TIFF_PHOTOMETRIC_YCBCR:
|
|
||||||
case TIFF_PHOTOMETRIC_CIE_LAB:
|
case TIFF_PHOTOMETRIC_CIE_LAB:
|
||||||
case TIFF_PHOTOMETRIC_ICC_LAB:
|
case TIFF_PHOTOMETRIC_ICC_LAB:
|
||||||
case TIFF_PHOTOMETRIC_ITU_LAB:
|
case TIFF_PHOTOMETRIC_ITU_LAB:
|
||||||
|
@ -1076,7 +1148,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
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,
|
if ((ret = tiff_unpack_strip(s, p, dst, stride, avpkt->data + soff, ssize, i,
|
||||||
FFMIN(s->rps, s->height - i))) < 0) {
|
FFMIN(s->rps, s->height - i))) < 0) {
|
||||||
if (avctx->err_recognition & AV_EF_EXPLODE)
|
if (avctx->err_recognition & AV_EF_EXPLODE)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1085,6 +1157,10 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
dst += s->rps * stride;
|
dst += s->rps * stride;
|
||||||
}
|
}
|
||||||
if (s->predictor == 2) {
|
if (s->predictor == 2) {
|
||||||
|
if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR, "predictor == 2 with YUV is unsupported");
|
||||||
|
return AVERROR_PATCHWELCOME;
|
||||||
|
}
|
||||||
dst = p->data[plane];
|
dst = p->data[plane];
|
||||||
soff = s->bpp >> 3;
|
soff = s->bpp >> 3;
|
||||||
if (s->planar)
|
if (s->planar)
|
||||||
|
|
Loading…
Reference in New Issue