[FFmpeg-cvslog] r23532 - in trunk: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/pictordec.c
pross
subversion
Tue Jun 8 13:55:06 CEST 2010
Author: pross
Date: Tue Jun 8 13:55:06 2010
New Revision: 23532
Log:
Pictor/PC Paint decoder
Added:
trunk/libavcodec/pictordec.c
Modified:
trunk/Changelog
trunk/doc/general.texi
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Tue Jun 8 13:48:03 2010 (r23531)
+++ trunk/Changelog Tue Jun 8 13:55:06 2010 (r23532)
@@ -10,6 +10,7 @@ version <next>:
- VP8 de/encoding via libvpx
- CODEC_CAP_EXPERIMENTAL added
- Demuxer for On2's IVF format
+- Pictor/PC Paint decoder
Modified: trunk/doc/general.texi
==============================================================================
--- trunk/doc/general.texi Tue Jun 8 13:48:03 2010 (r23531)
+++ trunk/doc/general.texi Tue Jun 8 13:55:06 2010 (r23532)
@@ -281,6 +281,8 @@ following image formats are supported:
@tab Portable GrayMap image
@item PGMYUV @tab X @tab X
@tab PGM with U and V components in YUV 4:2:0
+ at item PIC @tab @tab X
+ @tab Pictor/PC Paint
@item PNG @tab X @tab X
@tab 2/4 bpp not supported yet
@item PPM @tab X @tab X
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Tue Jun 8 13:48:03 2010 (r23531)
+++ trunk/libavcodec/Makefile Tue Jun 8 13:55:06 2010 (r23532)
@@ -264,6 +264,7 @@ OBJS-$(CONFIG_PGM_ENCODER) +
OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
+OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c Tue Jun 8 13:48:03 2010 (r23531)
+++ trunk/libavcodec/allcodecs.c Tue Jun 8 13:55:06 2010 (r23532)
@@ -152,6 +152,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (PCX, pcx);
REGISTER_ENCDEC (PGM, pgm);
REGISTER_ENCDEC (PGMYUV, pgmyuv);
+ REGISTER_DECODER (PICTOR, pictor);
REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm);
REGISTER_DECODER (PTX, ptx);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Tue Jun 8 13:48:03 2010 (r23531)
+++ trunk/libavcodec/avcodec.h Tue Jun 8 13:55:06 2010 (r23532)
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 74
+#define LIBAVCODEC_VERSION_MINOR 75
#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -211,6 +211,7 @@ enum CodecID {
CODEC_ID_KGV1,
CODEC_ID_YOP,
CODEC_ID_VP8,
+ CODEC_ID_PICTOR,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
Added: trunk/libavcodec/pictordec.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/pictordec.c Tue Jun 8 13:55:06 2010 (r23532)
@@ -0,0 +1,250 @@
+/*
+ * Pictor/PC Paint decoder
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/picdec.c
+ * Pictor/PC Paint decoder
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "cga_data.h"
+
+typedef struct PicContext {
+ AVFrame frame;
+ int width, height;
+ int nb_planes;
+} PicContext;
+
+static void picmemset_8bpp(PicContext *s, int value, int run, int *x, int *y)
+{
+ while (run > 0) {
+ uint8_t *d = s->frame.data[0] + *y * s->frame.linesize[0];
+ if (*x + run >= s->width) {
+ int n = s->width - *x;
+ memset(d + *x, value, n);
+ run -= n;
+ *x = 0;
+ *y -= 1;
+ if (*y < 0)
+ break;
+ } else {
+ memset(d + *x, value, run);
+ *x += run;
+ break;
+ }
+ }
+}
+
+static void picmemset(PicContext *s, int value, int run, int *x, int *y, int *plane, int bits_per_plane)
+{
+ uint8_t *d;
+ int shift = *plane * bits_per_plane;
+ int mask = ((1 << bits_per_plane) - 1) << shift;
+ value <<= shift;
+
+ while (run > 0) {
+ int j;
+ for (j = 8-bits_per_plane; j >= 0; j -= bits_per_plane) {
+ d = s->frame.data[0] + *y * s->frame.linesize[0];
+ d[*x] |= (value >> j) & mask;
+ *x += 1;
+ if (*x == s->width) {
+ *y -= 1;
+ *x = 0;
+ if (*y < 0) {
+ *y = s->height - 1;
+ *plane += 1;
+ value <<= bits_per_plane;
+ mask <<= bits_per_plane;
+ if (*plane >= s->nb_planes)
+ break;
+ }
+ }
+ }
+ run--;
+ }
+}
+
+static const uint8_t cga_mode45_index[6][4] = {
+ [0] = { 0, 3, 5, 7 }, // mode4, palette#1, low intensity
+ [1] = { 0, 2, 4, 6 }, // mode4, palette#2, low intensity
+ [2] = { 0, 3, 4, 7 }, // mode5, low intensity
+ [3] = { 0, 11, 13, 15 }, // mode4, palette#1, high intensity
+ [4] = { 0, 10, 12, 14 }, // mode4, palette#2, high intensity
+ [5] = { 0, 11, 12, 15 }, // mode5, high intensity
+};
+
+static int decode_frame(AVCodecContext *avctx,
+ void *data, int *data_size,
+ AVPacket *avpkt)
+{
+ PicContext *s = avctx->priv_data;
+ int buf_size = avpkt->size;
+ const uint8_t *buf = avpkt->data;
+ const uint8_t *buf_end = avpkt->data + buf_size;
+ uint32_t *palette;
+ int bits_per_plane, bpp, etype, esize, npal;
+ int i, x, y, plane;
+
+ if (buf_size < 11)
+ return AVERROR_INVALIDDATA;
+
+ if (bytestream_get_le16(&buf) != 0x1234)
+ return AVERROR_INVALIDDATA;
+ s->width = bytestream_get_le16(&buf);
+ s->height = bytestream_get_le16(&buf);
+ buf += 4;
+ bits_per_plane = *buf & 0xF;
+ s->nb_planes = (*buf++ >> 4) + 1;
+ bpp = s->nb_planes ? bits_per_plane*s->nb_planes : bits_per_plane;
+ if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
+ av_log_ask_for_sample(s, "unsupported bit depth\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (*buf == 0xFF) {
+ buf += 2;
+ etype = bytestream_get_le16(&buf);
+ esize = bytestream_get_le16(&buf);
+ if (buf_end - buf < esize)
+ return AVERROR_INVALIDDATA;
+ } else {
+ etype = -1;
+ esize = 0;
+ }
+
+ avctx->pix_fmt = PIX_FMT_PAL8;
+
+ if (s->width != avctx->width && s->height != avctx->height) {
+ if (avcodec_check_dimensions(avctx, s->width, s->height) < 0)
+ return -1;
+ avcodec_set_dimensions(avctx, s->width, s->height);
+ if (s->frame.data[0])
+ avctx->release_buffer(avctx, &s->frame);
+ }
+
+ if (avctx->get_buffer(avctx, &s->frame) < 0){
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
+ memset(s->frame.data[0], 0, s->height * s->frame.linesize[0]);
+ s->frame.pict_type = FF_I_TYPE;
+ s->frame.palette_has_changed = 1;
+
+ palette = (uint32_t*)s->frame.data[1];
+ if (etype == 1 && esize > 1 && *buf < 6) {
+ int idx = *buf;
+ npal = 4;
+ for (i = 0; i < npal; i++)
+ palette[i] = ff_cga_palette[ cga_mode45_index[idx][i] ];
+ } else if (etype == 2) {
+ npal = FFMIN(esize, 16);
+ for (i = 0; i < npal; i++)
+ palette[i] = ff_cga_palette[ FFMIN(buf[i], 16)];
+ } else if (etype == 3) {
+ npal = FFMIN(esize, 16);
+ for (i = 0; i < npal; i++)
+ palette[i] = ff_ega_palette[ FFMIN(buf[i], 63)];
+ } else if (etype == 4 || etype == 5) {
+ npal = FFMIN(esize / 3, 256);
+ for (i = 0; i < npal; i++)
+ palette[i] = AV_RB24(buf + i*3) << 2;
+ } else {
+ if (bpp == 1) {
+ npal = 2;
+ palette[0] = 0x000000;
+ palette[1] = 0xFFFFFF;
+ } else if (bpp == 2) {
+ npal = 4;
+ for (i = 0; i < npal; i++)
+ palette[i] = ff_cga_palette[ cga_mode45_index[0][i] ];
+ } else {
+ npal = 16;
+ memcpy(palette, ff_cga_palette, npal * 4);
+ }
+ }
+ // fill remaining palette entries
+ memset(palette + npal, 0, AVPALETTE_SIZE - npal * 4);
+ buf += esize;
+
+
+ x = 0;
+ y = s->height - 1;
+ plane = 0;
+ if (bytestream_get_le16(&buf)) {
+ while (buf_end - buf >= 6) {
+ const uint8_t *buf_pend = buf + FFMIN(AV_RL16(buf), buf_end - buf);
+ //ignore uncompressed block size reported at buf[2]
+ int marker = buf[4];
+ buf += 5;
+
+ while (plane < s->nb_planes && buf_pend - buf >= 1) {
+ int run = 1;
+ int val = *buf++;
+ if (val == marker) {
+ run = *buf++;
+ if (run == 0)
+ run = bytestream_get_le16(&buf);
+ val = *buf++;
+ }
+ if (buf > buf_end)
+ break;
+
+ if (bits_per_plane == 8) {
+ picmemset_8bpp(s, val, run, &x, &y);
+ if (y < 0)
+ break;
+ } else {
+ picmemset(s, val, run, &x, &y, &plane, bits_per_plane);
+ }
+ }
+ }
+ } else {
+ av_log_ask_for_sample(s, "uncompressed image\n");
+ return buf_size;
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame*)data = s->frame;
+ return buf_size;
+}
+
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+ PicContext *s = avctx->priv_data;
+ if (s->frame.data[0])
+ avctx->release_buffer(avctx, &s->frame);
+ return 0;
+}
+
+AVCodec pictor_decoder = {
+ "pictor",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PICTOR,
+ sizeof(PicContext),
+ NULL,
+ NULL,
+ decode_end,
+ decode_frame,
+ CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
+};
More information about the ffmpeg-cvslog
mailing list