diff options
Diffstat (limited to 'libavcodec/sgidec.c')
| -rw-r--r-- | libavcodec/sgidec.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index a4b31288f2..e7f453bc17 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -2,24 +2,25 @@ * SGI image decoder * Todd Kirby <doubleshot@pacbell.net> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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, + * FFmpeg 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 + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/imgutils.h" +#include "libavutil/avassert.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" @@ -48,16 +49,16 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf, unsigned char pixel, count; unsigned char *orig = out_buf; - while (1) { + while (out_buf < out_end) { if (bytestream2_get_bytes_left(&s->g) < 1) return AVERROR_INVALIDDATA; pixel = bytestream2_get_byteu(&s->g); if (!(count = (pixel & 0x7f))) { - return (out_buf - orig) / pixelstride; + break; } /* Check for buffer overflow. */ - if(out_buf + pixelstride * count >= out_end) return -1; + if(out_buf + pixelstride * (count-1) >= out_end) return -1; if (pixel & 0x80) { while (count--) { @@ -73,6 +74,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf, } } } + return (out_buf - orig) / pixelstride; } /** @@ -100,7 +102,7 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) dest_row -= s->linesize; start_offset = bytestream2_get_be32(&g_table); bytestream2_seek(&s->g, start_offset, SEEK_SET); - if (expand_rle_row(s, dest_row + z, dest_row + FFABS(s->linesize), + if (expand_rle_row(s, dest_row + z, dest_row + s->width*s->depth, s->depth) != s->width) { return AVERROR_INVALIDDATA; } @@ -112,16 +114,15 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) /** * Read an uncompressed SGI image. * @param out_buf output buffer - * @param out_end end ofoutput buffer * @param s the current image state * @return 0 if read success, otherwise return -1. */ -static int read_uncompressed_sgi(unsigned char* out_buf, uint8_t* out_end, - SgiState *s) +static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s) { int x, y, z; unsigned int offset = s->height * s->width * s->bytes_per_channel; GetByteContext gp[4]; + uint8_t *out_end; /* Test buffer size. */ if (offset * s->depth > bytestream2_get_bytes_left(&s->g)) @@ -166,17 +167,17 @@ static int decode_frame(AVCodecContext *avctx, } /* Test for SGI magic. */ - if (bytestream2_get_be16(&s->g) != SGI_MAGIC) { + if (bytestream2_get_be16u(&s->g) != SGI_MAGIC) { av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); return AVERROR_INVALIDDATA; } - rle = bytestream2_get_byte(&s->g); - s->bytes_per_channel = bytestream2_get_byte(&s->g); - dimension = bytestream2_get_be16(&s->g); - s->width = bytestream2_get_be16(&s->g); - s->height = bytestream2_get_be16(&s->g); - s->depth = bytestream2_get_be16(&s->g); + rle = bytestream2_get_byteu(&s->g); + s->bytes_per_channel = bytestream2_get_byteu(&s->g); + dimension = bytestream2_get_be16u(&s->g); + s->width = bytestream2_get_be16u(&s->g); + s->height = bytestream2_get_be16u(&s->g); + s->depth = bytestream2_get_be16u(&s->g); if (s->bytes_per_channel != 1 && (s->bytes_per_channel != 2 || rle)) { av_log(avctx, AV_LOG_ERROR, "wrong channel number\n"); @@ -193,8 +194,8 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_GRAY16BE : AV_PIX_FMT_GRAY8; } else if (s->depth == SGI_RGB) { avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGB48BE : AV_PIX_FMT_RGB24; - } else if (s->depth == SGI_RGBA && s->bytes_per_channel == 1) { - avctx->pix_fmt = AV_PIX_FMT_RGBA; + } else if (s->depth == SGI_RGBA) { + avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA; } else { av_log(avctx, AV_LOG_ERROR, "wrong picture format\n"); return -1; @@ -204,10 +205,8 @@ static int decode_frame(AVCodecContext *avctx, return -1; avcodec_set_dimensions(avctx, s->width, s->height); - if (ff_get_buffer(avctx, p, 0) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n"); - return -1; - } + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; @@ -222,7 +221,7 @@ static int decode_frame(AVCodecContext *avctx, if (rle) { ret = read_rle_sgi(out_end, s); } else { - ret = read_uncompressed_sgi(out_buf, out_end, s); + ret = read_uncompressed_sgi(out_buf, s); } if (ret == 0) { |