diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-09-19 16:33:43 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-10-02 15:42:03 -0400 |
| commit | c19830aa2c19f9713b612f7e2fdb437df91ba266 (patch) | |
| tree | 0134189590f067d92509bd5874daf500a8a3f4c3 /libavcodec | |
| parent | b8d5070db6313f985562865edcfd08a01c2d7503 (diff) | |
| download | ffmpeg-c19830aa2c19f9713b612f7e2fdb437df91ba266.tar.gz | |
rscc: Support palette format
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rscc.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index 4a9178342a..dfc2338ec9 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -31,7 +31,7 @@ * and it can be deflated or not. Similarly, pixel data comes after the header * and a variable size value, and it can be deflated or just raw. * - * Supports: BGRA, BGR24, RGB555, RGB8 + * Supports: PAL8, BGRA, BGR24, RGB555, RGB8 */ #include <stdint.h> @@ -59,6 +59,8 @@ typedef struct RsccContext { unsigned int tiles_size; int component_size; + uint8_t palette[AVPALETTE_SIZE]; + /* zlib interaction */ uint8_t *inflated_buf; uLongf inflated_size; @@ -89,8 +91,8 @@ static av_cold int rscc_init(AVCodecContext *avctx) ctx->component_size = avctx->bits_per_coded_sample / 8; switch (avctx->bits_per_coded_sample) { case 8: - avpriv_report_missing_feature(avctx, "8 bits per pixel"); - return AVERROR_PATCHWELCOME; + avctx->pix_fmt = AV_PIX_FMT_PAL8; + break; case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555LE; break; @@ -291,6 +293,19 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data, } else { frame->pict_type = AV_PICTURE_TYPE_P; } + + /* Palette handling */ + if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { + const uint8_t *palette = av_packet_get_side_data(avpkt, + AV_PKT_DATA_PALETTE, + NULL); + if (palette) { + frame->palette_has_changed = 1; + memcpy(ctx->palette, palette, AVPALETTE_SIZE); + } + memcpy(frame->data[1], ctx->palette, AVPALETTE_SIZE); + } + *got_frame = 1; end: |