X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsgidec.c;h=6f93a3059e16235e1358382a0a751e78a427b9d5;hb=e39a9212ab37a55b346801c77487d8a47b6f9fe2;hp=dadbc19d2228bea5438659b48be92bb23c18581f;hpb=7a00bbad2100367481240e62876b941b5c4befdc;p=ffmpeg diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index dadbc19d222..6f93a3059e1 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -2,67 +2,75 @@ * SGI image decoder * Todd Kirby * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * 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. * - * FFmpeg is distributed in the hope that it will be useful, + * 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 FFmpeg; if not, write to the Free Software + * 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/imgutils.h" #include "avcodec.h" #include "bytestream.h" +#include "internal.h" #include "sgi.h" typedef struct SgiState { - AVFrame picture; + AVCodecContext *avctx; unsigned int width; unsigned int height; unsigned int depth; + unsigned int bytes_per_channel; int linesize; + GetByteContext g; } SgiState; /** * Expand an RLE row into a channel. - * @param in_buf input buffer - * @param in_end end of input buffer + * @param s the current image state * @param out_buf Points to one line after the output buffer. - * @param out_end end of line in output buffer + * @param len length of out_buf in bytes * @param pixelstride pixel stride of input buffer * @return size of output in bytes, -1 if buffer overflows */ -static int expand_rle_row(const uint8_t *in_buf, const uint8_t* in_end, - unsigned char *out_buf, uint8_t* out_end, int pixelstride) +static int expand_rle_row8(SgiState *s, uint8_t *out_buf, + int len, int pixelstride) { unsigned char pixel, count; unsigned char *orig = out_buf; + uint8_t *out_end = out_buf + len; - while (1) { - if(in_buf + 1 > in_end) return -1; - pixel = bytestream_get_byte(&in_buf); + 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 (pixelstride * (count - 1) >= len) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid pixel count.\n"); + return AVERROR_INVALIDDATA; + } if (pixel & 0x80) { while (count--) { - *out_buf = bytestream_get_byte(&in_buf); + *out_buf = bytestream2_get_byte(&s->g); out_buf += pixelstride; } } else { - pixel = bytestream_get_byte(&in_buf); + pixel = bytestream2_get_byte(&s->g); while (count--) { *out_buf = pixel; @@ -70,41 +78,81 @@ static int expand_rle_row(const uint8_t *in_buf, const uint8_t* in_end, } } } + return (out_buf - orig) / pixelstride; +} + +static int expand_rle_row16(SgiState *s, uint16_t *out_buf, + int len, int pixelstride) +{ + unsigned short pixel; + unsigned char count; + unsigned short *orig = out_buf; + uint16_t *out_end = out_buf + len; + + while (out_buf < out_end) { + if (bytestream2_get_bytes_left(&s->g) < 2) + return AVERROR_INVALIDDATA; + pixel = bytestream2_get_be16u(&s->g); + if (!(count = (pixel & 0x7f))) + break; + + /* Check for buffer overflow. */ + if (pixelstride * (count - 1) >= len) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid pixel count.\n"); + return AVERROR_INVALIDDATA; + } + + if (pixel & 0x80) { + while (count--) { + pixel = bytestream2_get_ne16(&s->g); + AV_WN16A(out_buf, pixel); + out_buf += pixelstride; + } + } else { + pixel = bytestream2_get_ne16(&s->g); + + while (count--) { + AV_WN16A(out_buf, pixel); + out_buf += pixelstride; + } + } + } + return (out_buf - orig) / pixelstride; } + /** * Read a run length encoded SGI image. * @param out_buf output buffer - * @param in_buf input buffer - * @param in_end end of input buffer * @param s the current image state * @return 0 if no error, else return error number. */ -static int read_rle_sgi(unsigned char* out_buf, const uint8_t *in_buf, - const uint8_t *in_end, SgiState* s) +static int read_rle_sgi(uint8_t *out_buf, SgiState *s) { uint8_t *dest_row; unsigned int len = s->height * s->depth * 4; - const uint8_t *start_table = in_buf; + GetByteContext g_table = s->g; unsigned int y, z; unsigned int start_offset; + int linesize, ret; /* size of RLE offset and length tables */ - if(len * 2 > in_end - in_buf) { + if (len * 2 > bytestream2_get_bytes_left(&s->g)) { return AVERROR_INVALIDDATA; } - in_buf -= SGI_HEADER_SIZE; for (z = 0; z < s->depth; z++) { dest_row = out_buf; for (y = 0; y < s->height; y++) { + linesize = s->width * s->depth * s->bytes_per_channel; dest_row -= s->linesize; - start_offset = bytestream_get_be32(&start_table); - if(start_offset > in_end - in_buf) { - return AVERROR_INVALIDDATA; - } - if (expand_rle_row(in_buf + start_offset, in_end, dest_row + z, - dest_row + FFABS(s->linesize), s->depth) != s->width) + start_offset = bytestream2_get_be32(&g_table); + bytestream2_seek(&s->g, start_offset, SEEK_SET); + if (s->bytes_per_channel == 1) + ret = expand_rle_row8(s, dest_row + z, linesize, s->depth); + else + ret = expand_rle_row16(s, (uint16_t *)dest_row + z, linesize, s->depth); + if (ret != s->width) return AVERROR_INVALIDDATA; } } @@ -114,105 +162,104 @@ static int read_rle_sgi(unsigned char* out_buf, const uint8_t *in_buf, /** * Read an uncompressed SGI image. * @param out_buf output buffer - * @param out_end end ofoutput buffer - * @param in_buf input buffer - * @param in_end end of input 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, - const uint8_t *in_buf, const uint8_t *in_end, SgiState* s) +static int read_uncompressed_sgi(unsigned char *out_buf, SgiState *s) { int x, y, z; - const uint8_t *ptr; - unsigned int offset = s->height * s->width; + 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 > in_end - in_buf) { - return -1; + if (offset * s->depth > bytestream2_get_bytes_left(&s->g)) + return AVERROR_INVALIDDATA; + + /* Create a reader for each plane */ + for (z = 0; z < s->depth; z++) { + gp[z] = s->g; + bytestream2_skip(&gp[z], z * offset); } for (y = s->height - 1; y >= 0; y--) { out_end = out_buf + (y * s->linesize); - for (x = s->width; x > 0; x--) { - ptr = in_buf++; - for(z = 0; z < s->depth; z ++) { - bytestream_put_byte(&out_end, *ptr); - ptr += offset; - } + if (s->bytes_per_channel == 1) { + for (x = s->width; x > 0; x--) + for (z = 0; z < s->depth; z++) + *out_end++ = bytestream2_get_byteu(&gp[z]); + } else { + uint16_t *out16 = (uint16_t *)out_end; + for (x = s->width; x > 0; x--) + for (z = 0; z < s->depth; z++) + *out16++ = bytestream2_get_ne16u(&gp[z]); } } return 0; } static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *in_buf = avpkt->data; - int buf_size = avpkt->size; SgiState *s = avctx->priv_data; - AVFrame *picture = data; - AVFrame *p = &s->picture; - const uint8_t *in_end = in_buf + buf_size; - unsigned int dimension, bytes_per_channel, rle; + AVFrame *p = data; + unsigned int dimension, rle; int ret = 0; uint8_t *out_buf, *out_end; - if (buf_size < SGI_HEADER_SIZE){ - av_log(avctx, AV_LOG_ERROR, "buf_size too small (%d)\n", buf_size); - return -1; + bytestream2_init(&s->g, avpkt->data, avpkt->size); + if (bytestream2_get_bytes_left(&s->g) < SGI_HEADER_SIZE) { + av_log(avctx, AV_LOG_ERROR, "buf_size too small (%d)\n", avpkt->size); + return AVERROR_INVALIDDATA; } /* Test for SGI magic. */ - if (bytestream_get_be16(&in_buf) != SGI_MAGIC) { + if (bytestream2_get_be16(&s->g) != SGI_MAGIC) { av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); - return -1; + return AVERROR_INVALIDDATA; } - rle = bytestream_get_byte(&in_buf); - bytes_per_channel = bytestream_get_byte(&in_buf); - dimension = bytestream_get_be16(&in_buf); - s->width = bytestream_get_be16(&in_buf); - s->height = bytestream_get_be16(&in_buf); - s->depth = bytestream_get_be16(&in_buf); + 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); - if (bytes_per_channel != 1) { + if (s->bytes_per_channel != 1 && s->bytes_per_channel != 2) { av_log(avctx, AV_LOG_ERROR, "wrong channel number\n"); - return -1; + return AVERROR(EINVAL); } /* Check for supported image dimensions. */ if (dimension != 2 && dimension != 3) { av_log(avctx, AV_LOG_ERROR, "wrong dimension number\n"); - return -1; + return AVERROR(EINVAL); } if (s->depth == SGI_GRAYSCALE) { - avctx->pix_fmt = PIX_FMT_GRAY8; + 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 = PIX_FMT_RGB24; + avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGB48BE : AV_PIX_FMT_RGB24; } else if (s->depth == SGI_RGBA) { - avctx->pix_fmt = PIX_FMT_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; + return AVERROR(EINVAL); } - if (avcodec_check_dimensions(avctx, s->width, s->height)) - return -1; - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; - if (p->data[0]) - avctx->release_buffer(avctx, p); - - p->reference = 0; - if (avctx->get_buffer(avctx, p) < 0) { + ret = ff_get_buffer(avctx, p, 0); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n"); - return -1; + return ret; } - p->pict_type = FF_I_TYPE; + p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; out_buf = p->data[0]; @@ -221,50 +268,37 @@ static int decode_frame(AVCodecContext *avctx, s->linesize = p->linesize[0]; /* Skip header. */ - in_buf += SGI_HEADER_SIZE - 12; + bytestream2_seek(&s->g, SGI_HEADER_SIZE, SEEK_SET); if (rle) { - ret = read_rle_sgi(out_end, in_buf, in_end, s); + ret = read_rle_sgi(out_end, s); } else { - ret = read_uncompressed_sgi(out_buf, out_end, in_buf, in_end, s); + ret = read_uncompressed_sgi(out_buf, s); } if (ret == 0) { - *picture = s->picture; - *data_size = sizeof(AVPicture); - return buf_size; + *got_frame = 1; + return avpkt->size; } else { - return -1; + return ret; } } -static av_cold int sgi_init(AVCodecContext *avctx){ - SgiState *s = avctx->priv_data; - - avcodec_get_frame_defaults(&s->picture); - avctx->coded_frame = &s->picture; - - return 0; -} - -static av_cold int sgi_end(AVCodecContext *avctx) +static av_cold int sgi_decode_init(AVCodecContext *avctx) { - SgiState * const s = avctx->priv_data; + SgiState *s = avctx->priv_data; - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); + s->avctx = avctx; return 0; } -AVCodec sgi_decoder = { - "sgi", - CODEC_TYPE_VIDEO, - CODEC_ID_SGI, - sizeof(SgiState), - sgi_init, - NULL, - sgi_end, - decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), +AVCodec ff_sgi_decoder = { + .name = "sgi", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_SGI, + .priv_data_size = sizeof(SgiState), + .decode = decode_frame, + .init = sgi_decode_init, + .capabilities = AV_CODEC_CAP_DR1, }; -