X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fiff.c;h=92c376446237c742835356b47ea1e0ffb16faed5;hb=bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e;hp=872c81ff5b611df85118afb23f14d495c373421e;hpb=6d810162823c2c76088df267c5c3e07e07b1437a;p=ffmpeg diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 872c81ff5b6..92c37644623 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -3,20 +3,20 @@ * Copyright (c) 2010 Peter Ross * Copyright (c) 2010 Sebastian Vater * - * 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 */ @@ -25,34 +25,38 @@ * IFF PBM/ILBM bitmap decoder */ +#include + +#include "libavutil/imgutils.h" #include "bytestream.h" #include "avcodec.h" #include "get_bits.h" -#include "iff.h" +#include "internal.h" -typedef struct { - AVFrame frame; +typedef struct IffContext { + AVFrame *frame; int planesize; uint8_t * planebuf; + int init; // 1 if buffer and palette data already initialized, 0 otherwise } IffContext; #define LUT8_PART(plane, v) \ - AV_LE2ME64C(UINT64_C(0x0000000)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1000000)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0010000)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1010000)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0000100)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1000100)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0010100)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1010100)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0000001)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1000001)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0010001)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1010001)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0000101)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1000101)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x0010101)<<32 | v) << plane, \ - AV_LE2ME64C(UINT64_C(0x1010101)<<32 | v) << plane + AV_LE2NE64C(UINT64_C(0x0000000)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1000000)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0010000)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1010000)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0000100)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1000100)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0010100)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1010100)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0000001)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1000001)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0010001)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1010001)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0000101)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1000101)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x0010101)<<32 | v) << plane, \ + AV_LE2NE64C(UINT64_C(0x1010101)<<32 | v) << plane #define LUT8(plane) { \ LUT8_PART(plane, 0x0000000), \ @@ -118,7 +122,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) { /** * Convert CMAP buffer (stored in extradata) to lavc palette format */ -int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) +static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) { int count, i; @@ -131,19 +135,25 @@ int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) // If extradata is smaller than actually needed, fill the remaining with black. count = FFMIN(avctx->extradata_size / 3, count); if (count) { - for (i=0; i < count; i++) { - pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); - } + for (i = 0; i < count; i++) + pal[i] = 0xFF000000 | AV_RB24(avctx->extradata + i * 3); } else { // Create gray-scale color palette for bps < 8 count = 1 << avctx->bits_per_coded_sample; - for (i=0; i < count; i++) { + for (i = 0; i < count; i++) pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample); - } } return 0; } +static av_cold int decode_end(AVCodecContext *avctx) +{ + IffContext *s = avctx->priv_data; + av_frame_free(&s->frame); + av_freep(&s->planebuf); + return 0; +} + static av_cold int decode_init(AVCodecContext *avctx) { IffContext *s = avctx->priv_data; @@ -151,30 +161,28 @@ static av_cold int decode_init(AVCodecContext *avctx) if (avctx->bits_per_coded_sample <= 8) { avctx->pix_fmt = (avctx->bits_per_coded_sample < 8 || - avctx->extradata_size) ? PIX_FMT_PAL8 - : PIX_FMT_GRAY8; + avctx->extradata_size) ? AV_PIX_FMT_PAL8 + : AV_PIX_FMT_GRAY8; } else if (avctx->bits_per_coded_sample <= 32) { - avctx->pix_fmt = PIX_FMT_BGR32; + avctx->pix_fmt = AV_PIX_FMT_BGR32; } else { return AVERROR_INVALIDDATA; } - if ((err = avcodec_check_dimensions(avctx, avctx->width, avctx->height))) + if ((err = av_image_check_size(avctx->width, avctx->height, 0, avctx))) return err; s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary - s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); + s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); if (!s->planebuf) return AVERROR(ENOMEM); - s->frame.reference = 1; - if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return err; + s->frame = av_frame_alloc(); + if (!s->frame) { + decode_end(avctx); + return AVERROR(ENOMEM); } - return (avctx->bits_per_coded_sample <= 8 && - avctx->pix_fmt != PIX_FMT_GRAY8) ? - ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0; + return 0; } /** @@ -210,183 +218,181 @@ static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int p dst[1] |= lut[mask++]; dst[2] |= lut[mask++]; dst[3] |= lut[mask]; - mask = (*buf++ << 2) & 0x3F; + mask = (*buf++ << 2) & 0x3F; dst[4] |= lut[mask++]; dst[5] |= lut[mask++]; dst[6] |= lut[mask++]; dst[7] |= lut[mask]; - dst += 8; + dst += 8; } while (--buf_size); } +/** + * Decode one complete byterun1 encoded line. + * + * @param dst the destination buffer where to store decompressed bitstream + * @param dst_size the destination plane size in bytes + * @param buf the source byterun1 compressed bitstream + * @param buf_end the EOF of source byterun1 compressed bitstream + * @return number of consumed bytes in byterun1 compressed bitstream + */ +static int decode_byterun(uint8_t *dst, int dst_size, + const uint8_t *buf, const uint8_t *const buf_end) +{ + const uint8_t *const buf_start = buf; + unsigned x; + for (x = 0; x < dst_size && buf < buf_end;) { + unsigned length; + const int8_t value = *buf++; + if (value >= 0) { + length = value + 1; + memcpy(dst + x, buf, FFMIN3(length, dst_size - x, buf_end - buf)); + buf += length; + } else if (value > -128) { + length = -value + 1; + memset(dst + x, *buf++, FFMIN(length, dst_size - x)); + } else { // noop + continue; + } + x += length; + } + return buf - buf_start; +} + static int decode_frame_ilbm(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) + void *data, int *got_frame, + AVPacket *avpkt) { - IffContext *s = avctx->priv_data; - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - const uint8_t *buf_end = buf+buf_size; - int y, plane; - - if (avctx->reget_buffer(avctx, &s->frame) < 0){ - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + IffContext *s = avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + const uint8_t *buf_end = buf + buf_size; + int y, plane, res; + + if ((res = ff_reget_buffer(avctx, s->frame)) < 0) + return res; + + if (!s->init && avctx->bits_per_coded_sample <= 8 && + avctx->pix_fmt != AV_PIX_FMT_GRAY8) { + if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame->data[1])) < 0) + return res; } + s->init = 1; - if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved - if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { - for(y = 0; y < avctx->height; y++ ) { - uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; + if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved + if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { + for (y = 0; y < avctx->height; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; memset(row, 0, avctx->width); - for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { + for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; + plane++) { decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); buf += s->planesize; } } - } else { // PIX_FMT_BGR32 - for(y = 0; y < avctx->height; y++ ) { - uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; + } else { // AV_PIX_FMT_BGR32 + for (y = 0; y < avctx->height; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; memset(row, 0, avctx->width << 2); - for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { - decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); + for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; + plane++) { + decodeplane32((uint32_t *)row, buf, + FFMIN(s->planesize, buf_end - buf), plane); buf += s->planesize; } } } - } else if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { // IFF-PBM - for(y = 0; y < avctx->height; y++ ) { - uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]]; + } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { // IFF-PBM + for (y = 0; y < avctx->height && buf < buf_end; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; memcpy(row, buf, FFMIN(avctx->width, buf_end - buf)); - buf += avctx->width; + buf += avctx->width + (avctx->width % 2); // padding if odd } } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = s->frame; + if ((res = av_frame_ref(data, s->frame)) < 0) + return res; + + *got_frame = 1; + return buf_size; } static int decode_frame_byterun1(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) + void *data, int *got_frame, + AVPacket *avpkt) { - IffContext *s = avctx->priv_data; - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - const uint8_t *buf_end = buf+buf_size; - int y, plane, x; - - if (avctx->reget_buffer(avctx, &s->frame) < 0){ - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + IffContext *s = avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + const uint8_t *buf_end = buf + buf_size; + int y, plane, res; + + if ((res = ff_reget_buffer(avctx, s->frame)) < 0) + return res; + + if (!s->init && avctx->bits_per_coded_sample <= 8 && + avctx->pix_fmt != AV_PIX_FMT_GRAY8) { + if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame->data[1])) < 0) + return res; } + s->init = 1; - if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved - if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { - for(y = 0; y < avctx->height ; y++ ) { - uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; + if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved + if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { + for (y = 0; y < avctx->height; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; memset(row, 0, avctx->width); for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { - for(x = 0; x < s->planesize && buf < buf_end; ) { - int8_t value = *buf++; - unsigned length; - if (value >= 0) { - length = value + 1; - memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); - buf += length; - } else if (value > -128) { - length = -value + 1; - memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); - } else { //noop - continue; - } - x += length; - } + buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end); decodeplane8(row, s->planebuf, s->planesize, plane); } } - } else { //PIX_FMT_BGR32 - for(y = 0; y < avctx->height ; y++ ) { - uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; + } else { // AV_PIX_FMT_BGR32 + for (y = 0; y < avctx->height; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; memset(row, 0, avctx->width << 2); for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { - for(x = 0; x < s->planesize && buf < buf_end; ) { - int8_t value = *buf++; - unsigned length; - if (value >= 0) { - length = value + 1; - memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); - buf += length; - } else if (value > -128) { - length = -value + 1; - memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); - } else { // noop - continue; - } - x += length; - } - decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane); + buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end); + decodeplane32((uint32_t *)row, s->planebuf, s->planesize, plane); } } } } else { - for(y = 0; y < avctx->height ; y++ ) { - uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; - for(x = 0; x < avctx->width && buf < buf_end; ) { - int8_t value = *buf++; - unsigned length; - if (value >= 0) { - length = value + 1; - memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); - buf += length; - } else if (value > -128) { - length = -value + 1; - memset(row + x, *buf++, FFMIN(length, avctx->width - x)); - } else { //noop - continue; - } - x += length; - } + for (y = 0; y < avctx->height; y++) { + uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]]; + buf += decode_byterun(row, avctx->width, buf, buf_end); } } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = s->frame; - return buf_size; -} + if ((res = av_frame_ref(data, s->frame)) < 0) + return res; -static av_cold int decode_end(AVCodecContext *avctx) -{ - IffContext *s = avctx->priv_data; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - av_freep(&s->planebuf); - return 0; + *got_frame = 1; + + return buf_size; } -AVCodec iff_ilbm_decoder = { - "iff_ilbm", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_IFF_ILBM, - sizeof(IffContext), - decode_init, - NULL, - decode_end, - decode_frame_ilbm, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), +AVCodec ff_iff_ilbm_decoder = { + .name = "iff_ilbm", + .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_IFF_ILBM, + .priv_data_size = sizeof(IffContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame_ilbm, + .capabilities = CODEC_CAP_DR1, }; -AVCodec iff_byterun1_decoder = { - "iff_byterun1", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_IFF_BYTERUN1, - sizeof(IffContext), - decode_init, - NULL, - decode_end, - decode_frame_byterun1, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), +AVCodec ff_iff_byterun1_decoder = { + .name = "iff_byterun1", + .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_IFF_BYTERUN1, + .priv_data_size = sizeof(IffContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame_byterun1, + .capabilities = CODEC_CAP_DR1, };