diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-02 13:39:21 +0300 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-02 13:39:21 +0300 |
commit | 28307ef7e62874ad5925885af9ccc6423ff83841 (patch) | |
tree | af891d9415c8bdf11ab961beb9cc6d981801bc87 /libavcodec/psd.c | |
parent | d800d48fc67208819c2a4ae5eb214ca5e3ad7e82 (diff) |
lavc/psd: Support indexed files.
Fixes ticket #6045.
Diffstat (limited to 'libavcodec/psd.c')
-rw-r--r-- | libavcodec/psd.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 3181a41d48..7587ed9c80 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -60,6 +60,8 @@ typedef struct PSDContext { enum PsdCompr compression; enum PsdColorMode color_mode; + + uint8_t palette[AVPALETTE_SIZE]; } PSDContext; 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"); 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); /* 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; 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: if (s->channel_count == 3) { 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); picture->pict_type = AV_PICTURE_TYPE_I; |