RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

rscc: Support palette format

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Carl Eugen Hoyos 2016-09-19 16:33:43 -04:00 committed by Vittorio Giovara
parent b8d5070db6
commit c19830aa2c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/rscc.c
View File

@ -31,7 +31,7 @@
* and it can be deflated or not. Similarly, pixel data comes after the header * 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. * 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> #include <stdint.h>
@ -59,6 +59,8 @@ typedef struct RsccContext {
unsigned int tiles_size; unsigned int tiles_size;
int component_size; int component_size;
uint8_t palette[AVPALETTE_SIZE];
/* zlib interaction */ /* zlib interaction */
uint8_t *inflated_buf; uint8_t *inflated_buf;
uLongf inflated_size; uLongf inflated_size;
@ -89,8 +91,8 @@ static av_cold int rscc_init(AVCodecContext *avctx)
ctx->component_size = avctx->bits_per_coded_sample / 8; ctx->component_size = avctx->bits_per_coded_sample / 8;
switch (avctx->bits_per_coded_sample) { switch (avctx->bits_per_coded_sample) {
case 8: case 8:
avpriv_report_missing_feature(avctx, "8 bits per pixel"); avctx->pix_fmt = AV_PIX_FMT_PAL8;
return AVERROR_PATCHWELCOME; break;
case 16: case 16:
avctx->pix_fmt = AV_PIX_FMT_RGB555LE; avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
break; break;
@ -291,6 +293,19 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
} else { } else {
frame->pict_type = AV_PICTURE_TYPE_P; 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; *got_frame = 1;
end: end: