On Sat, Mar 22, 2014 at 05:35:03AM +0100, Vittorio Giovara wrote:
> ---
> I ended up rewriting the decoder from scratch.
> Also added X10 format.
>
> Cheers,
> Vittorio
> Changelog | 1 +
> doc/general.texi | 2 +-
> libavcodec/Makefile | 1 +
> libavcodec/allcodecs.c | 2 +-
> libavcodec/version.h | 4 +-
> libavcodec/xbmdec.c | 118
> +++++++++++++++++++++++++++++++++++++++++++++++++
> 6 files changed, 124 insertions(+), 4 deletions(-)
> create mode 100644 libavcodec/xbmdec.c
>
> diff --git a/Changelog b/Changelog
> index d0939a2..4bafca5 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -5,6 +5,7 @@ version <next>:
> - libx265 encoder
> - 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 c04b3f1..c4dbc89 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -403,6 +403,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/version.h b/libavcodec/version.h
> index 5ab49d5..d2f80ad 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,8 +29,8 @@
> #include "libavutil/version.h"
>
> #define LIBAVCODEC_VERSION_MAJOR 55
> -#define LIBAVCODEC_VERSION_MINOR 34
> -#define LIBAVCODEC_VERSION_MICRO 1
> +#define LIBAVCODEC_VERSION_MINOR 35
> +#define LIBAVCODEC_VERSION_MICRO 0
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> LIBAVCODEC_VERSION_MINOR, \
> diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
> new file mode 100644
> index 0000000..ea452ae
> --- /dev/null
> +++ b/libavcodec/xbmdec.c
> @@ -0,0 +1,118 @@
> +/*
> + * 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 (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", 5) == 0) {
> + ptr += strcspn(ptr, " ");
> + height = strtol(ptr, NULL, 10);
> + } else {
> + // skip offset and unknown variables
> + av_log(avctx, AV_LOG_WARNING,
> + "Unkown preprocessor directive.\n");
it's still #define, not something unknown
and maybe skipping it silently is better
> + }
where's a check for end of buffer?
> + }
> +
> + 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;
> + } else {
> + av_log(avctx, AV_LOG_ERROR,
> + "Unexpected data at %.8s.\n", ptr);
> + return AVERROR_INVALIDDATA;
> + }
> + ptr += 2; // jump after 0x
I think you should skip to endptr at least
> + } 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,
> +};
> --
in general looks much nicer than before
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
