Permalink
Browse files

XWD encoder and decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
  • Loading branch information...
1 parent 7662a53 commit 27ed027bcdcb7445ab62d4870a8be3615ffc1e31 @richardpl richardpl committed with Kostya Shishkov Jan 21, 2012
Showing with 564 additions and 2 deletions.
  1. +1 −0 Changelog
  2. +2 −0 doc/general.texi
  3. +2 −0 libavcodec/Makefile
  4. +1 −0 libavcodec/allcodecs.c
  5. +1 −0 libavcodec/avcodec.h
  6. +1 −1 libavcodec/version.h
  7. +41 −0 libavcodec/xwd.h
  8. +267 −0 libavcodec/xwddec.c
  9. +246 −0 libavcodec/xwdenc.c
  10. +2 −1 libavformat/img2.c
View
@@ -6,6 +6,7 @@ version 0.8:
- GSM audio parser
- SMJPEG muxer
+- XWD encoder and decoder
version 0.8_beta2:
View
@@ -379,6 +379,8 @@ following image formats are supported:
@tab YUV, JPEG and some extension is not supported yet.
@item Truevision Targa @tab X @tab X
@tab Targa (.TGA) image format
+@item XWD @tab X @tab X
+ @tab X Window Dump image format
@end multitable
@code{X} means that encoding (resp. decoding) is supported.
View
@@ -435,6 +435,8 @@ OBJS-$(CONFIG_XAN_WC4_DECODER) += xxan.o
OBJS-$(CONFIG_XL_DECODER) += xl.o
OBJS-$(CONFIG_XSUB_DECODER) += xsubdec.o
OBJS-$(CONFIG_XSUB_ENCODER) += xsubenc.o
+OBJS-$(CONFIG_XWD_DECODER) += xwddec.o
+OBJS-$(CONFIG_XWD_ENCODER) += xwdenc.o
OBJS-$(CONFIG_YOP_DECODER) += yop.o
OBJS-$(CONFIG_ZLIB_DECODER) += lcldec.o
OBJS-$(CONFIG_ZLIB_ENCODER) += lclenc.o
@@ -230,6 +230,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (XAN_WC3, xan_wc3);
REGISTER_DECODER (XAN_WC4, xan_wc4);
REGISTER_DECODER (XL, xl);
+ REGISTER_ENCDEC (XWD, xwd);
REGISTER_DECODER (YOP, yop);
REGISTER_ENCDEC (ZLIB, zlib);
REGISTER_ENCDEC (ZMBV, zmbv);
@@ -254,6 +254,7 @@ enum CodecID {
CODEC_ID_VBLE,
CODEC_ID_DXTORY,
CODEC_ID_V410,
+ CODEC_ID_XWD,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 34
+#define LIBAVCODEC_VERSION_MINOR 35
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
View
@@ -0,0 +1,41 @@
+/*
+ * XWD image format
+ *
+ * Copyright (c) 2012 Paul B Mahol
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XWD_H
+#define AVCODEC_XWD_H
+
+#define XWD_VERSION 7
+#define XWD_HEADER_SIZE 100
+#define XWD_CMAP_SIZE 12
+
+#define XWD_XY_BITMAP 0
+#define XWD_XY_PIXMAP 1
+#define XWD_Z_PIXMAP 2
+
+#define XWD_STATIC_GRAY 0
+#define XWD_GRAY_SCALE 1
+#define XWD_STATIC_COLOR 2
+#define XWD_PSEUDO_COLOR 3
+#define XWD_TRUE_COLOR 4
+#define XWD_DIRECT_COLOR 5
+
+#endif /* AVCODEC_XWD_H */
View
@@ -0,0 +1,267 @@
+/*
+ * XWD image format
+ *
+ * Copyright (c) 2012 Paul B Mahol
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/imgutils.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "xwd.h"
+
+static av_cold int xwd_decode_init(AVCodecContext *avctx)
+{
+ avctx->coded_frame = avcodec_alloc_frame();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static int xwd_decode_frame(AVCodecContext *avctx, void *data,
+ int *data_size, AVPacket *avpkt)
+{
+ AVFrame *p = avctx->coded_frame;
+ const uint8_t *buf = avpkt->data;
+ int i, ret, buf_size = avpkt->size;
+ uint32_t version, header_size, vclass, ncolors;
+ uint32_t xoffset, be, bpp, lsize, rsize;
+ uint32_t pixformat, pixdepth, bunit, bitorder, bpad;
+ uint32_t rgb[3];
+ uint8_t *ptr;
+
+ if (buf_size < XWD_HEADER_SIZE)
+ return AVERROR_INVALIDDATA;
+
+ header_size = bytestream_get_be32(&buf);
+ if (buf_size < header_size)
+ return AVERROR_INVALIDDATA;
+
+ version = bytestream_get_be32(&buf);
+ if (version != XWD_VERSION) {
+ av_log(avctx, AV_LOG_ERROR, "unsupported version\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (header_size < XWD_HEADER_SIZE) {
+ av_log(avctx, AV_LOG_ERROR, "invalid header size\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ pixformat = bytestream_get_be32(&buf);
+ pixdepth = bytestream_get_be32(&buf);
+ avctx->width = bytestream_get_be32(&buf);
+ avctx->height = bytestream_get_be32(&buf);
+ xoffset = bytestream_get_be32(&buf);
+ be = bytestream_get_be32(&buf);
+ bunit = bytestream_get_be32(&buf);
+ bitorder = bytestream_get_be32(&buf);
+ bpad = bytestream_get_be32(&buf);
+ bpp = bytestream_get_be32(&buf);
+ lsize = bytestream_get_be32(&buf);
+ vclass = bytestream_get_be32(&buf);
+ rgb[0] = bytestream_get_be32(&buf);
+ rgb[1] = bytestream_get_be32(&buf);
+ rgb[2] = bytestream_get_be32(&buf);
+ buf += 8;
+ ncolors = bytestream_get_be32(&buf);
+ buf += header_size - (XWD_HEADER_SIZE - 20);
+
+ av_log(avctx, AV_LOG_DEBUG, "pixformat %d, pixdepth %d, bunit %d, bitorder %d, bpad %d\n",
+ pixformat, pixdepth, bunit, bitorder, bpad);
+ av_log(avctx, AV_LOG_DEBUG, "vclass %d, ncolors %d, bpp %d, be %d, lsize %d, xoffset %d\n",
+ vclass, ncolors, bpp, be, lsize, xoffset);
+ av_log(avctx, AV_LOG_DEBUG, "red %0x, green %0x, blue %0x\n", rgb[0], rgb[1], rgb[2]);
+
+ if (pixformat > XWD_Z_PIXMAP) {
+ av_log(avctx, AV_LOG_ERROR, "invalid pixmap format\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (pixdepth == 0 || pixdepth > 32) {
+ av_log(avctx, AV_LOG_ERROR, "invalid pixmap depth\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (xoffset) {
+ av_log_ask_for_sample(avctx, "unsupported xoffset %d\n", xoffset);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (be > 1) {
+ av_log(avctx, AV_LOG_ERROR, "invalid byte order\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (bitorder > 1) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bitmap bit order\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (bunit != 8 && bunit != 16 && bunit != 32) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bitmap unit\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (bpad != 8 && bpad != 16 && bpad != 32) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bitmap scan-line pad\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (bpp == 0 || bpp > 32) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bits per pixel\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (ncolors > 256) {
+ av_log(avctx, AV_LOG_ERROR, "invalid number of entries in colormap\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = av_image_check_size(avctx->width, avctx->height, 0, NULL)) < 0)
+ return ret;
+
+ rsize = FFALIGN(avctx->width * bpp, bpad) / 8;
+ if (lsize < rsize) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bytes per scan-line\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (buf_size < header_size + ncolors * XWD_CMAP_SIZE + avctx->height * lsize) {
+ av_log(avctx, AV_LOG_ERROR, "input buffer too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (pixformat != XWD_Z_PIXMAP) {
+ av_log(avctx, AV_LOG_ERROR, "pixmap format %d unsupported\n", pixformat);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ avctx->pix_fmt = PIX_FMT_NONE;
+ switch (vclass) {
+ case XWD_STATIC_GRAY:
+ case XWD_GRAY_SCALE:
+ if (bpp != 1)
+ return AVERROR_INVALIDDATA;
+ if (pixdepth == 1)
+ avctx->pix_fmt = PIX_FMT_MONOWHITE;
+ break;
+ case XWD_STATIC_COLOR:
+ case XWD_PSEUDO_COLOR:
+ if (bpp == 8)
+ avctx->pix_fmt = PIX_FMT_PAL8;
+ break;
+ case XWD_TRUE_COLOR:
+ case XWD_DIRECT_COLOR:
+ if (bpp != 16 && bpp != 24 && bpp != 32)
+ return AVERROR_INVALIDDATA;
+ if (bpp == 16 && pixdepth == 15) {
+ if (rgb[0] == 0x7C00 && rgb[1] == 0x3E0 && rgb[2] == 0x1F)
+ avctx->pix_fmt = be ? PIX_FMT_RGB555BE : PIX_FMT_RGB555LE;
+ else if (rgb[0] == 0x1F && rgb[1] == 0x3E0 && rgb[2] == 0x7C00)
+ avctx->pix_fmt = be ? PIX_FMT_BGR555BE : PIX_FMT_BGR555LE;
+ } else if (bpp == 16 && pixdepth == 16) {
+ if (rgb[0] == 0xF800 && rgb[1] == 0x7E0 && rgb[2] == 0x1F)
+ avctx->pix_fmt = be ? PIX_FMT_RGB565BE : PIX_FMT_RGB565LE;
+ else if (rgb[0] == 0x1F && rgb[1] == 0x7E0 && rgb[2] == 0xF800)
+ avctx->pix_fmt = be ? PIX_FMT_BGR565BE : PIX_FMT_BGR565LE;
+ } else if (bpp == 24) {
+ if (rgb[0] == 0xFF0000 && rgb[1] == 0xFF00 && rgb[2] == 0xFF)
+ avctx->pix_fmt = be ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
+ else if (rgb[0] == 0xFF && rgb[1] == 0xFF00 && rgb[2] == 0xFF0000)
+ avctx->pix_fmt = be ? PIX_FMT_BGR24 : PIX_FMT_RGB24;
+ } else if (bpp == 32) {
+ if (rgb[0] == 0xFF0000 && rgb[1] == 0xFF00 && rgb[2] == 0xFF)
+ avctx->pix_fmt = be ? PIX_FMT_ARGB : PIX_FMT_BGRA;
+ else if (rgb[0] == 0xFF && rgb[1] == 0xFF00 && rgb[2] == 0xFF0000)
+ avctx->pix_fmt = be ? PIX_FMT_ABGR : PIX_FMT_RGBA;
+ }
+ buf += ncolors * XWD_CMAP_SIZE;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "invalid visual class\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (avctx->pix_fmt == PIX_FMT_NONE) {
+ av_log_ask_for_sample(avctx, "unknown file: bpp %d, pixdepth %d, vclass %d\n", bpp, pixdepth, vclass);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (p->data[0])
+ avctx->release_buffer(avctx, p);
+
+ p->reference = 0;
+ if ((ret = avctx->get_buffer(avctx, p)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ p->key_frame = 1;
+ p->pict_type = AV_PICTURE_TYPE_I;
+
+ if (avctx->pix_fmt == PIX_FMT_PAL8) {
+ uint32_t *dst = (uint32_t *)p->data[1];
+ uint8_t red, green, blue;
+
+ for (i = 0; i < ncolors; i++) {
+
+ buf += 4; // skip colormap entry number
+ red = *buf; buf += 2;
+ green = *buf; buf += 2;
+ blue = *buf; buf += 2;
+ buf += 2; // skip bitmask flag and padding
+
+ dst[i] = red << 16 | green << 8 | blue;
+ }
+ }
+
+ ptr = p->data[0];
+ for (i = 0; i < avctx->height; i++) {
+ bytestream_get_buffer(&buf, ptr, rsize);
+ buf += lsize - rsize;
+ ptr += p->linesize[0];
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame *)data = *p;
+
+ return buf_size;
+}
+
+static av_cold int xwd_decode_close(AVCodecContext *avctx)
+{
+ if (avctx->coded_frame->data[0])
+ avctx->release_buffer(avctx, avctx->coded_frame);
+
+ av_freep(&avctx->coded_frame);
+
+ return 0;
+}
+
+AVCodec ff_xwd_decoder = {
+ .name = "xwd",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_XWD,
+ .init = xwd_decode_init,
+ .close = xwd_decode_close,
+ .decode = xwd_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
+};
Oops, something went wrong.

0 comments on commit 27ed027

Please sign in to comment.