X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fiff.c;h=99da7b5d614f9ba9fc8f1edbd183dfb8e30d9cd7;hb=8c9af5b2051b9927f845c7afdfeb30b82670ee77;hp=bcf4929b7f44974cf25e9c5526a70788be682e0f;hpb=ec1d1afc0953ceccc78069b3bc584ec8d29bdda7;p=ffmpeg diff --git a/libavcodec/iff.c b/libavcodec/iff.c index bcf4929b7f4..99da7b5d614 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,36 @@ * IFF PBM/ILBM bitmap decoder */ +#include "libavutil/imgutils.h" #include "bytestream.h" #include "avcodec.h" #include "get_bits.h" -#include "iff.h" +#include "internal.h" typedef struct { 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 +120,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 ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) { int count, i; @@ -151,15 +153,15 @@ 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); @@ -167,14 +169,8 @@ static av_cold int decode_init(AVCodecContext *avctx) 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; - } - 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; } /** @@ -220,7 +216,7 @@ static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int p } /** - * Decodes one complete byterun1 encoded line. + * 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 @@ -251,22 +247,31 @@ static int decode_byterun(uint8_t *dst, int dst_size, } static int decode_frame_ilbm(AVCodecContext *avctx, - void *data, int *data_size, + 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; + int y, plane, res; - if (avctx->reget_buffer(avctx, &s->frame) < 0){ + if (s->init) { + if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + return res; + } + } else if ((res = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return res; + } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != AV_PIX_FMT_GRAY8) { + if ((res = ff_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) { + 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); @@ -275,7 +280,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx, buf += s->planesize; } } - } else { // PIX_FMT_BGR32 + } 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); @@ -285,36 +290,45 @@ static int decode_frame_ilbm(AVCodecContext *avctx, } } } - } else if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { // IFF-PBM + } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { // IFF-PBM for(y = 0; y < avctx->height; 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); + *got_frame = 1; *(AVFrame*)data = s->frame; return buf_size; } static int decode_frame_byterun1(AVCodecContext *avctx, - void *data, int *data_size, + 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; + int y, plane, res; - if (avctx->reget_buffer(avctx, &s->frame) < 0){ + if (s->init) { + if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + return res; + } + } else if ((res = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return res; + } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != AV_PIX_FMT_GRAY8) { + if ((res = ff_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) { + 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); @@ -323,7 +337,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx, decodeplane8(row, s->planebuf, s->planesize, plane); } } - } else { //PIX_FMT_BGR32 + } 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); @@ -340,7 +354,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx, } } - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = s->frame; return buf_size; } @@ -354,28 +368,26 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } -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", + .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, + .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), }; -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", + .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, + .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), };