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

tiff: fix {2,4}bpp grayscale palettes. 

Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if
there is no palette defined.
Fixes ticket #3915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet 2014-09-05 11:15:13 +02:00 committed by Michael Niedermayer
parent db8970d7b6
commit 4f10495055
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/tiff.c
View File

@ -653,6 +653,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
static int init_image(TiffContext *s, ThreadFrame *frame) static int init_image(TiffContext *s, ThreadFrame *frame)
{ {
int ret; int ret;
int create_gray_palette = 0;
switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) { switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) {
case 11: case 11:
@ -662,6 +663,11 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
} }
case 21: case 21:
case 41: case 41:
s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
if (!s->palette_is_set) {
create_gray_palette = 1;
}
break;
case 81: case 81:
s->avctx->pix_fmt = s->palette_is_set ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8; s->avctx->pix_fmt = s->palette_is_set ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8;
break; break;
@ -741,7 +747,15 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0) if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0)
return ret; return ret;
if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
memcpy(frame->f->data[1], s->palette, sizeof(s->palette)); if (!create_gray_palette)
memcpy(frame->f->data[1], s->palette, sizeof(s->palette));
else {
/* make default grayscale pal */
int i;
uint32_t *pal = (uint32_t *)frame->f->data[1];
for (i = 0; i < 1<<s->bpp; i++)
pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101;
}
} }
return 0; return 0;
} }