From: Paul B Mahol <one...@gmail.com> --- I don't think having a test for this format is necessary... No version bump anywhere, right? Vittorio
Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/xbmdec.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 libavcodec/xbmdec.c diff --git a/Changelog b/Changelog index 279c0d8..31ad315 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version <next>: - compand audio filter - shuffleplanes filter +- XBM decoder version 10: diff --git a/doc/general.texi b/doc/general.texi index 8c0cb1b..88588d0 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -465,7 +465,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 bd93a6f..2bfee54 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -402,6 +402,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 ed6d7ff..021dbae 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -268,7 +268,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/xbmdec.c b/libavcodec/xbmdec.c new file mode 100644 index 0000000..25be8a0 --- /dev/null +++ b/libavcodec/xbmdec.c @@ -0,0 +1,120 @@ +/* + * XBM 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/avstring.h" + +#include "avcodec.h" +#include "internal.h" +#include "mathops.h" + +static av_cold int xbm_decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; + + return 0; +} + +static int convert(uint8_t x) +{ + if (x >= 'a') + x -= 87; + else if (x >= 'A') + x -= 55; + else + x -= '0'; + return x; +} + +static int xbm_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + AVFrame *p = data; + const uint8_t *end, *ptr = avpkt->data; + uint8_t *dst; + int ret, linesize, i, j; + + end = avpkt->data + avpkt->size; + while (!avctx->width || !avctx->height) { + char name[256]; + int number, len; + + ptr += strcspn(ptr, "#"); + if (sscanf(ptr, "#define %255s %u", name, &number) != 2) { + av_log(avctx, AV_LOG_ERROR, "Unexpected preprocessor directive\n"); + return AVERROR_INVALIDDATA; + } + + len = strlen(name); + if ((len > 6) && !avctx->height && !memcmp(name + len - 7, "_height", 7)) { + avctx->height = number; + } else if ((len > 5) && !avctx->width && !memcmp(name + len - 6, "_width", 6)) { + avctx->width = number; + } else { + av_log(avctx, AV_LOG_ERROR, "Unknown define '%s'\n", name); + return AVERROR_INVALIDDATA; + } + ptr += strcspn(ptr, "\n\r") + 1; + } + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + + // goto start of image data + ptr += strcspn(ptr, "{") + 1; + + linesize = (avctx->width + 7) / 8; + for (i = 0; i < avctx->height; i++) { + dst = p->data[0] + i * p->linesize[0]; + for (j = 0; j < linesize; j++) { + uint8_t val; + + ptr += strcspn(ptr, "x") + 1; + if (ptr < end && av_isxdigit(*ptr)) { + val = convert(*ptr); + ptr++; + if (av_isxdigit(*ptr)) + val = (val << 4) + convert(*ptr); + *dst++ = ff_reverse[val]; + } else { + av_log(avctx, AV_LOG_ERROR, "Unexpected data at '%.8s'\n", ptr); + return AVERROR_INVALIDDATA; + } + } + } + + 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, + .init = xbm_decode_init, + .decode = xbm_decode_frame, + .capabilities = CODEC_CAP_DR1, +}; -- 1.8.3.4 (Apple Git-47) _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel