virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/rscc: Support pal8 in rscc.

Browse Source 
Fixes the colours of the sample for ticket #5611.
This commit is contained in:
Carl Eugen Hoyos
2016-09-19 23:26:06 +02:00
parent 2c48014ab2
commit 11777eb814
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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: GRAY8, BGRA, BGR24, RGB555, RGB8 * Supports: BGRA, BGR24, RGB555, PAL8
*/ */
#include <stdint.h> #include <stdint.h>
@@ -58,6 +58,7 @@ typedef struct RsccContext {
Tile *tiles; Tile *tiles;
unsigned int tiles_size; unsigned int tiles_size;
int component_size; int component_size;
uint32_t pal[AVPALETTE_COUNT];
/* zlib interaction */ /* zlib interaction */
uint8_t *inflated_buf; uint8_t *inflated_buf;
@@ -89,7 +90,7 @@ 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:
avctx->pix_fmt = AV_PIX_FMT_GRAY8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
break; break;
case 16: case 16:
avctx->pix_fmt = AV_PIX_FMT_RGB555LE; avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
@@ -308,6 +309,16 @@ 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;
} }
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
const uint8_t *pal = av_packet_get_side_data(avpkt,
AV_PKT_DATA_PALETTE,
NULL);
if (pal) {
frame->palette_has_changed = 1;
memcpy(ctx->pal, pal, AVPALETTE_SIZE);
}
memcpy (frame->data[1], ctx->pal, AVPALETTE_SIZE);
}
*got_frame = 1; *got_frame = 1;
end: end:

2
libavcodec/version.h
View File

@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 57 #define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \