[FFmpeg-cvslog] lavc/rscc: Support pal8 in rscc.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Sep 19 23:26:06 2016 +0200| [11777eb8142117864bff0c8060f17b4089434143] | committer: Carl Eugen Hoyos

lavc/rscc: Support pal8 in rscc.

Fixes the colours of the sample for ticket #5611.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11777eb8142117864bff0c8060f17b4089434143
---

 libavcodec/rscc.c    | 15 +++++++++++++--
 libavcodec/version.h |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index 3b3703c..7f280a9 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: GRAY8, BGRA, BGR24, RGB555, RGB8
+ * Supports: BGRA, BGR24, RGB555, PAL8
  */
 
 #include <stdint.h>
@@ -58,6 +58,7 @@ typedef struct RsccContext {
     Tile *tiles;
     unsigned int tiles_size;
     int component_size;
+    uint32_t pal[AVPALETTE_COUNT];
 
     /* zlib interaction */
     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;
         switch (avctx->bits_per_coded_sample) {
         case 8:
-            avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+            avctx->pix_fmt = AV_PIX_FMT_PAL8;
             break;
         case 16:
             avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
@@ -308,6 +309,16 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
     } else {
         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;
 
 end:
diff --git a/libavcodec/version.h b/libavcodec/version.h
index ccb2890..9acf081 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR  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, \
                                                LIBAVCODEC_VERSION_MINOR, \