* Copyright (c) 2010 Peter Ross <pross@xvid.org>
* Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com>
*
- * 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
*/
* IFF PBM/ILBM bitmap decoder
*/
+#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"
#include "get_bits.h"
-#include "iff.h"
typedef struct {
AVFrame frame;
} 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), \
/**
* 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;
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);
}
/**
- * 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
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,
+AVCodec ff_iff_ilbm_decoder = {
+ .name = "iff_ilbm",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = 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,
+AVCodec ff_iff_byterun1_decoder = {
+ .name = "iff_byterun1",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = 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"),
};