On Wed, Mar 26, 2014 at 07:19:54PM +0100, Vittorio Giovara wrote: > --- > Variable name change and two possible out of bounds reads spotted by Kostya. > Vittorio > > Changelog | 1 + > doc/general.texi | 2 + > libavcodec/Makefile | 2 + > libavcodec/aliaspixdec.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/aliaspixenc.c | 134 > +++++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/codec_desc.c | 7 +++ > libavcodec/version.h | 2 +- > libavformat/img2.c | 1 + > libavformat/img2enc.c | 2 +- > 11 files changed, 277 insertions(+), 2 deletions(-) > create mode 100644 libavcodec/aliaspixdec.c > create mode 100644 libavcodec/aliaspixenc.c > > diff --git a/Changelog b/Changelog > index 76eca07..ed182bb 100644 > --- a/Changelog > +++ b/Changelog > @@ -5,6 +5,7 @@ version <next>: > - libx265 encoder > - shuffleplanes filter > - replaygain data export > +- Alias PIX image encoder and decoder > > > version 10: > diff --git a/doc/general.texi b/doc/general.texi > index 8c0cb1b..dce4c0a 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -424,6 +424,8 @@ following image formats are supported: > @item Name @tab Encoding @tab Decoding @tab Comments > @item .Y.U.V @tab X @tab X > @tab one raw file per component > +@item Alias PIX @tab X @tab X > + @tab Alias/Wavefront PIX image format > @item animated GIF @tab X @tab X > @tab Only uncompressed GIFs are generated. > @item BMP @tab X @tab X > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index c13d5e5..f4dfa85 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -90,6 +90,8 @@ OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o > ac3enc.o ac3tab.o ac3.o > OBJS-$(CONFIG_AIC_DECODER) += aic.o > OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o > OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o alac_data.o > +OBJS-$(CONFIG_ALIAS_PIX_DECODER) += aliaspixdec.o > +OBJS-$(CONFIG_ALIAS_PIX_ENCODER) += aliaspixenc.o > OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o > OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ > celp_math.o acelp_filters.o \ > diff --git a/libavcodec/aliaspixdec.c b/libavcodec/aliaspixdec.c > new file mode 100644 > index 0000000..6872004 > --- /dev/null > +++ b/libavcodec/aliaspixdec.c > @@ -0,0 +1,126 @@ > +/* > + * Alias PIX image decoder > + * Copyright (C) 2014 Vittorio Giovara <vittorio.giov...@gmail.com> > + * > + * 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/intreadwrite.h" > + > +#include "avcodec.h" > +#include "bytestream.h" > +#include "internal.h" > + > +#define ALIAS_HEADER_SIZE 10 > + > +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, > + AVPacket *avpkt) > +{ > + AVFrame *f = data; > + GetByteContext gb; > + int width, height, ret, bits_pixel, pixel; > + uint8_t *out_buf; > + uint8_t count; > + int x, y = 0; > + > + bytestream2_init(&gb, avpkt->data, avpkt->size); > + > + if (bytestream2_get_bytes_left(&gb) < ALIAS_HEADER_SIZE) { > + av_log(avctx, AV_LOG_ERROR, "Header too small %d.\n", avpkt->size); > + return AVERROR_INVALIDDATA; > + } > + > + width = bytestream2_get_be16u(&gb); > + height = bytestream2_get_be16u(&gb); > + bytestream2_skipu(&gb, 4); // obsolete X, Y offset > + bits_pixel = bytestream2_get_be16u(&gb); > + > + if (bits_pixel == 24) > + avctx->pix_fmt = AV_PIX_FMT_BGR24; > + else if (bits_pixel == 8) > + avctx->pix_fmt = AV_PIX_FMT_GRAY8; > + else { > + av_log(avctx, AV_LOG_ERROR, "Invalid pixel format.\n"); > + return AVERROR_INVALIDDATA; > + } > + > + ret = ff_set_dimensions(avctx, width, height); > + if (ret < 0) > + return ret; > + > + ret = ff_get_buffer(avctx, f, 0); > + if (ret < 0) > + return ret; > + > + f->pict_type = AV_PICTURE_TYPE_I; > + f->key_frame = 1; > + > + x = avctx->width;
x = 0; out_buf = f->data[0]; > + while (bytestream2_get_bytes_left(&gb) > 0) { > + int i; > + > + /* set buffer at the right position at every new line */ > + if (x == avctx->width) { > + x = 0; > + out_buf = f->data[0] + f->linesize[0] * y++; > + if (y > avctx->height) { > + av_log(avctx, AV_LOG_ERROR, > + "Ended frame decoding with %d bytes left.\n", > + bytestream2_get_bytes_left(&gb)); > + return AVERROR_INVALIDDATA; > + } > + } > + > + /* read packet and copy data */ > + count = bytestream2_get_byteu(&gb); > + if (!count || x + count > avctx->width) { > + av_log(avctx, AV_LOG_ERROR, "Invalid run length %d.\n", count); > + return AVERROR_INVALIDDATA; > + } > + > + if (avctx->pix_fmt == AV_PIX_FMT_BGR24) { > + pixel = bytestream2_get_be24u(&gb); u? Are you sure it doesn't need to be checked? > + for (i = 0; i < count; i++) { > + AV_WB24(out_buf, pixel); > + out_buf += 3; > + } > + } else { // AV_PIX_FMT_GRAY8 > + pixel = bytestream2_get_byteu(&gb); ditto the rest (including encoder) LGTM _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel