From 678082b409aca711f9cf991df6b0200116489322 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sat, 22 Mar 2014 05:33:27 +0100 Subject: [PATCH] X-Bitmap decoder --- Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/version.h | 2 +- libavcodec/xbmdec.c | 122 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 libavcodec/xbmdec.c diff --git a/Changelog b/Changelog index f6398f459a..c7f4ca6331 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ version : - Alias PIX image encoder and decoder - BRender PIX image decoder - Amazing Studio PAF playback support +- XBM decoder version 10: diff --git a/doc/general.texi b/doc/general.texi index 53a38e6770..f338efde04 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -471,7 +471,7 @@ following image formats are supported: @tab Targa (.TGA) image format @item WebP @tab E @tab X @tab WebP image format, encoding supported through external library libwebp -@item XBM @tab X @tab +@item XBM @tab X @tab X @tab X BitMap image format @item XWD @tab X @tab X @tab X Window Dump image format diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c0b1070a8e..cb5962330b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -410,6 +410,7 @@ OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o OBJS-$(CONFIG_XAN_WC4_DECODER) += xxan.o +OBJS-$(CONFIG_XBM_DECODER) += xbmdec.o OBJS-$(CONFIG_XBM_ENCODER) += xbmenc.o OBJS-$(CONFIG_XL_DECODER) += xl.o OBJS-$(CONFIG_XSUB_DECODER) += xsubdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 01efadbd0f..a435b17c78 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -271,7 +271,7 @@ void avcodec_register_all(void) REGISTER_DECODER(WNV1, wnv1); REGISTER_DECODER(XAN_WC3, xan_wc3); REGISTER_DECODER(XAN_WC4, xan_wc4); - REGISTER_ENCODER(XBM, xbm); + REGISTER_ENCDEC (XBM, xbm); REGISTER_DECODER(XL, xl); REGISTER_ENCDEC (XWD, xwd); REGISTER_DECODER(YOP, yop); diff --git a/libavcodec/version.h b/libavcodec/version.h index 192359b990..dc6e2e903f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 39 +#define LIBAVCODEC_VERSION_MINOR 40 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c new file mode 100644 index 0000000000..c26f3433fd --- /dev/null +++ b/libavcodec/xbmdec.c @@ -0,0 +1,122 @@ +/* + * XBM image format + * + * 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/avstring.h" + +#include "avcodec.h" +#include "internal.h" +#include "mathops.h" + +static int xbm_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + AVFrame *p = data; + int ret, linesize, i; + int width = 0; + int height = 0; + const uint8_t *ptr = avpkt->data; + uint8_t *dst; + + avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; + while (!width || !height) { + ptr += strcspn(ptr, "#"); + if (ptr >= avpkt->data + avpkt->size) { + av_log(avctx, AV_LOG_ERROR, "End of file reached.\n"); + return AVERROR_INVALIDDATA; + } + if (strncmp(ptr, "#define", 7) != 0) { + av_log(avctx, AV_LOG_ERROR, + "Unexpected preprocessor directive.\n"); + return AVERROR_INVALIDDATA; + } + // skip the name + ptr += strcspn(ptr, "_") + 1; + // get width or height + if (strncmp(ptr, "width", 5) == 0) { + ptr += strcspn(ptr, " "); + width = strtol(ptr, NULL, 10); + } else if (strncmp(ptr, "height", 6) == 0) { + ptr += strcspn(ptr, " "); + height = strtol(ptr, NULL, 10); + } else { + // skip offset and unknown variables + av_log(avctx, AV_LOG_VERBOSE, + "Ignoring preprocessor directive.\n"); + } + } + + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) + return ret; + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + + // go to start of image data + ptr += strcspn(ptr, "{"); + + linesize = (avctx->width + 7) / 8; + for (i = 0; i < avctx->height; i++) { + int eol = 0, e = 0; + dst = p->data[0] + i * p->linesize[0]; + if (ptr >= avpkt->data + avpkt->size) { + av_log(avctx, AV_LOG_ERROR, "End of file reached.\n"); + return AVERROR_INVALIDDATA; + } + do { + int val; + uint8_t *endptr; + + ptr += strcspn(ptr, "x") - 1; // -1 to get 0x + val = strtol(ptr, (char **)&endptr, 16); + + if (endptr - ptr == 4) { + // XBM X11 format + *dst++ = ff_reverse[val]; + eol = linesize; + } else if (endptr - ptr == 6) { + // XBM X10 format + *dst++ = ff_reverse[val >> 8]; + *dst++ = ff_reverse[val & 0xFF]; + eol = linesize / 2; // 2 bytes read + } else { + av_log(avctx, AV_LOG_ERROR, + "Unexpected data at %.8s.\n", ptr); + return AVERROR_INVALIDDATA; + } + ptr = endptr; + } while (++e < eol); + } + + p->key_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; + + *got_frame = 1; + + return avpkt->size; +} + +AVCodec ff_xbm_decoder = { + .name = "xbm", + .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_XBM, + .decode = xbm_decode_frame, + .capabilities = CODEC_CAP_DR1, +};