diff options
author | Peter Ross <pross@xvid.org> | 2012-11-30 03:44:36 +0400 |
---|---|---|
committer | Peter Ross <pross@xvid.org> | 2012-12-11 13:17:30 +0400 |
commit | 7016aa655b100d4582036b63fd7d6de1cec552fa (patch) | |
tree | 36024038f0d717cd3d955f72b4849c193a494e0e /libavcodec/iff.c | |
parent | 53ae32d33109d691bad7a04f527e6d5d55ce4b91 (diff) |
iff decoder: support RGB8 and RGBN
Diffstat (limited to 'libavcodec/iff.c')
-rw-r--r-- | libavcodec/iff.c | 71 |
1 files changed, 70 insertions, 1 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 0e4c172c79..c4672b8f91 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -335,7 +335,11 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = (avctx->bits_per_coded_sample < 8) || (avctx->extradata_size >= 2 && palette_size) ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8; } else if (avctx->bits_per_coded_sample <= 32) { - if (avctx->codec_tag != MKTAG('D','E','E','P')) { + if (avctx->codec_tag == MKTAG('R','G','B','8')) { + avctx->pix_fmt = AV_PIX_FMT_RGB32; + } else if (avctx->codec_tag == MKTAG('R','G','B','N')) { + avctx->pix_fmt = AV_PIX_FMT_RGB444; + } else if (avctx->codec_tag != MKTAG('D','E','E','P')) { if (avctx->bits_per_coded_sample == 24) { avctx->pix_fmt = AV_PIX_FMT_RGB0; } else if (avctx->bits_per_coded_sample == 32) { @@ -484,6 +488,61 @@ static int decode_byterun(uint8_t *dst, int dst_size, return buf - buf_start; } +#define DECODE_RGBX_COMMON(pixel_size) \ + if (!length) { \ + length = bytestream2_get_byte(gb); \ + if (!length) { \ + length = bytestream2_get_be16(gb); \ + if (!length) \ + return; \ + } \ + } \ + for (i = 0; i < length; i++) { \ + *(uint32_t *)(dst + y*linesize + x * pixel_size) = pixel; \ + x += 1; \ + if (x >= width) { \ + y += 1; \ + if (y >= height) \ + return; \ + x = 0; \ + } \ + } + +/** + * Decode RGB8 buffer + * @param[out] dst Destination buffer + * @param width Width of destination buffer (pixels) + * @param height Height of destination buffer (pixels) + * @param linesize Line size of destination buffer (bytes) + */ +static void decode_rgb8(GetByteContext *gb, uint8_t *dst, int width, int height, int linesize) +{ + int x = 0, y = 0, i, length; + while (bytestream2_get_bytes_left(gb) >= 4) { + uint32_t pixel = 0xFF000000 | bytestream2_get_be24(gb); + length = bytestream2_get_byte(gb) & 0x7F; + DECODE_RGBX_COMMON(4) + } +} + +/** + * Decode RGBN buffer + * @param[out] dst Destination buffer + * @param width Width of destination buffer (pixels) + * @param height Height of destination buffer (pixels) + * @param linesize Line size of destination buffer (bytes) + */ +static void decode_rgbn(GetByteContext *gb, uint8_t *dst, int width, int height, int linesize) +{ + int x = 0, y = 0, i, length; + while (bytestream2_get_bytes_left(gb) >= 2) { + uint32_t pixel = bytestream2_get_be16u(gb); + length = pixel & 0x7; + pixel >>= 4; + DECODE_RGBX_COMMON(2) + } +} + /** * Decode DEEP RLE 32-bit buffer * @param[out] dst Destination buffer @@ -599,6 +658,7 @@ static int decode_frame(AVCodecContext *avctx, const int buf_size = avpkt->size >= 2 ? avpkt->size - AV_RB16(avpkt->data) : 0; const uint8_t *buf_end = buf+buf_size; int y, plane, res; + GetByteContext gb; if ((res = extract_header(avctx, avpkt)) < 0) return res; @@ -770,6 +830,15 @@ static int decode_frame(AVCodecContext *avctx, return unsupported(avctx); } break; + case 4: + bytestream2_init(&gb, buf, buf_size); + if (avctx->codec_tag == MKTAG('R','G','B','8')) + decode_rgb8(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); + else if (avctx->codec_tag == MKTAG('R','G','B','N')) + decode_rgbn(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); + else + return unsupported(avctx); + break; case 5: if (avctx->codec_tag == MKTAG('D','E','E','P')) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); |