diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-05-05 02:24:15 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-05-10 23:03:50 +0200 |
| commit | 6dc79637f34f4a5a76f4bf9e66b78a27d156b1df (patch) | |
| tree | 7f8a99b4f7c8182e5a4367ae0a9b9972e46a96d9 /libavcodec | |
| parent | 94818025394b5e840a2c94ce8ddd501c8cc17652 (diff) | |
| download | ffmpeg-6dc79637f34f4a5a76f4bf9e66b78a27d156b1df.tar.gz | |
lavc/qdrw: Read PixMap palette.
Fixes ticket #6195.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qdrw.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 82cc528a30..32ba410968 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -45,14 +45,14 @@ enum QuickdrawOpcodes { }; static int parse_palette(AVCodecContext *avctx, GetByteContext *gbc, - uint32_t *pal, int colors) + uint32_t *pal, int colors, int pixmap) { int i; for (i = 0; i <= colors; i++) { uint8_t r, g, b; unsigned int idx = bytestream2_get_be16(gbc); /* color index */ - if (idx > 255) { + if (idx > 255 && !pixmap) { av_log(avctx, AV_LOG_WARNING, "Palette index out of range: %u\n", idx); bytestream2_skip(gbc, 6); @@ -66,7 +66,7 @@ static int parse_palette(AVCodecContext *avctx, GetByteContext *gbc, bytestream2_skip(gbc, 1); b = bytestream2_get_byte(gbc); bytestream2_skip(gbc, 1); - pal[idx] = (0xFFU << 24) | (r << 16) | (g << 8) | b; + pal[pixmap ? i : idx] = (0xFFU << 24) | (r << 16) | (g << 8) | b; } return 0; } @@ -335,6 +335,7 @@ static int decode_frame(AVCodecContext *avctx, while (bytestream2_get_bytes_left(&gbc) >= 4) { int bppcnt, bpp; int rowbytes, pack_type; + int flags; int opcode = bytestream2_get_be16(&gbc); switch(opcode) { @@ -345,7 +346,8 @@ static int decode_frame(AVCodecContext *avctx, case PACKBITSRGN: av_log(avctx, AV_LOG_DEBUG, "Parsing Packbit opcode\n"); - bytestream2_skip(&gbc, 30); + flags = bytestream2_get_be16(&gbc) & 0xC000; + bytestream2_skip(&gbc, 28); bppcnt = bytestream2_get_be16(&gbc); /* cmpCount */ bpp = bytestream2_get_be16(&gbc); /* cmpSize */ @@ -380,7 +382,7 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; - ret = parse_palette(avctx, &gbc, (uint32_t *)p->data[1], colors); + ret = parse_palette(avctx, &gbc, (uint32_t *)p->data[1], colors, flags & 0x8000); if (ret < 0) return ret; p->palette_has_changed = 1; |