diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-30 01:24:50 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-30 01:24:50 +0100 |
| commit | 2f1d6d45af42fc8bfa4d13afef08ad9465d216cc (patch) | |
| tree | 14534763e3f372baa12b2489f8465a75df88dfdb /libavcodec/cdgraphics.c | |
| parent | b7fb7c4542af63fea433a5417e4efe2d8c4422f6 (diff) | |
| download | ffmpeg-2f1d6d45af42fc8bfa4d13afef08ad9465d216cc.tar.gz | |
lavc/cdg: Add transparency support.
Diffstat (limited to 'libavcodec/cdgraphics.c')
| -rw-r--r-- | libavcodec/cdgraphics.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index aca7cb057b..87ad5e79f4 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -49,6 +49,7 @@ #define CDG_INST_TILE_BLOCK 6 #define CDG_INST_SCROLL_PRESET 20 #define CDG_INST_SCROLL_COPY 24 +#define CDG_INST_TRANSPARENT_COL 28 #define CDG_INST_LOAD_PAL_LO 30 #define CDG_INST_LOAD_PAL_HIGH 31 #define CDG_INST_TILE_BLOCK_XOR 38 @@ -67,6 +68,7 @@ typedef struct CDGraphicsContext { AVFrame *frame; int hscroll; int vscroll; + int transparency; } CDGraphicsContext; static av_cold int cdg_decode_init(AVCodecContext *avctx) @@ -76,6 +78,7 @@ static av_cold int cdg_decode_init(AVCodecContext *avctx) cc->frame = av_frame_alloc(); if (!cc->frame) return AVERROR(ENOMEM); + cc->transparency = -1; avctx->width = CDG_FULL_WIDTH; avctx->height = CDG_FULL_HEIGHT; @@ -120,6 +123,8 @@ static void cdg_load_palette(CDGraphicsContext *cc, uint8_t *data, int low) g = ((color >> 4) & 0x000F) * 17; b = ((color ) & 0x000F) * 17; palette[i + array_offset] = 0xFFU << 24 | r << 16 | g << 8 | b; + if (cc->transparency >= 0) + palette[cc->transparency] &= 0xFFFFFF; } cc->frame->palette_has_changed = 1; } @@ -341,6 +346,9 @@ static int cdg_decode_frame(AVCodecContext *avctx, if (ret < 0) return ret; break; + case CDG_INST_TRANSPARENT_COL: + cc->transparency = cdg_data[0] & 0xF; + break; default: break; } |