virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/psd: Support indexed files.

Browse Source 
Fixes ticket #6045.
This commit is contained in:
Carl Eugen Hoyos
2017-01-02 11:39:21 +01:00
parent d800d48fc6
commit 28307ef7e6
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/psd.c
View File

@@ -60,6 +60,8 @@ typedef struct PSDContext {
enum PsdCompr compression; enum PsdCompr compression;
enum PsdColorMode color_mode; enum PsdColorMode color_mode;
uint8_t palette[AVPALETTE_SIZE];
} PSDContext; } PSDContext;
static int decode_header(PSDContext * s) static int decode_header(PSDContext * s)
@@ -159,6 +161,14 @@ static int decode_header(PSDContext * s)
av_log(s->avctx, AV_LOG_ERROR, "Incomplete file.\n"); av_log(s->avctx, AV_LOG_ERROR, "Incomplete file.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (len_section) {
int i,j;
memset(s->palette, 0xff, AVPALETTE_SIZE);
for (j = HAVE_BIGENDIAN; j < 3 + HAVE_BIGENDIAN; j++)
for (i = 0; i < FFMIN(256, len_section / 3); i++)
s->palette[i * 4 + (HAVE_BIGENDIAN ? j : 2 - j)] = bytestream2_get_byteu(&s->gb);
len_section -= i * 3;
}
bytestream2_skip(&s->gb, len_section); bytestream2_skip(&s->gb, len_section);
/* image ressources */ /* image ressources */
@@ -309,6 +319,15 @@ static int decode_frame(AVCodecContext *avctx, void *data,
s->uncompressed_size = s->line_size * s->height * s->channel_count; s->uncompressed_size = s->line_size * s->height * s->channel_count;
switch (s->color_mode) { switch (s->color_mode) {
case PSD_INDEXED:
if (s->channel_depth != 8 || s->channel_count != 1) {
av_log(s->avctx, AV_LOG_ERROR,
"Invalid indexed file (channel_depth %d, channel_count %d)\n",
s->channel_depth, s->channel_count);
return AVERROR_INVALIDDATA;
}
avctx->pix_fmt = AV_PIX_FMT_PAL8;
break;
case PSD_RGB: case PSD_RGB:
if (s->channel_count == 3) { if (s->channel_count == 3) {
if (s->channel_depth == 8) { if (s->channel_depth == 8) {
@@ -416,6 +435,11 @@ static int decode_frame(AVCodecContext *avctx, void *data,
} }
} }
if (s->color_mode == PSD_INDEXED) {
picture->palette_has_changed = 1;
memcpy(picture->data[1], s->palette, AVPALETTE_SIZE);
}
av_freep(&s->tmp); av_freep(&s->tmp);
picture->pict_type = AV_PICTURE_TYPE_I; picture->pict_type = AV_PICTURE_TYPE_I;