videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

IFF PBM/ILBM bitmap decoder 

Originally committed as revision 21622 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2010-02-03 09:56:16 +00:00
parent 299fd39697
commit b9e06dddb7
6 changed files with 235 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -53,6 +53,7 @@ version <next>:
- RTP depacketization of H.263
- Bink demuxer and Bink Audio decoder
- enable symbol versioning by default for linkers that support it
- IFF PBM/ILBM bitmap decoder

4
doc/general.texi
View File

@ -387,6 +387,10 @@ following image formats are supported:
@tab Used in Quake II.
@item id RoQ video @tab X @tab X
@tab Used in Quake III, Jedi Knight 2, other computer games.
@item IFF ILBM @tab @tab X
@tab IFF interlaved bitmap
@item IFF ByteRun1 @tab @tab X
@tab IFF run length encoded bitmap
@item Intel H.263 @tab @tab X
@item Intel Indeo 2 @tab @tab X
@item Intel Indeo 3 @tab @tab X

2
libavcodec/Makefile
View File

@ -144,6 +144,8 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o
OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o
OBJS-$(CONFIG_IMC_DECODER) += imc.o
OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o

2
libavcodec/allcodecs.c
View File

@ -114,6 +114,8 @@ void avcodec_register_all(void)
REGISTER_DECODER (H264_VDPAU, h264_vdpau);
REGISTER_ENCDEC (HUFFYUV, huffyuv);
REGISTER_DECODER (IDCIN, idcin);
REGISTER_DECODER (IFF_BYTERUN1, iff_byterun1);
REGISTER_DECODER (IFF_ILBM, iff_ilbm);
REGISTER_DECODER (INDEO2, indeo2);
REGISTER_DECODER (INDEO3, indeo3);
REGISTER_DECODER (INTERPLAY_VIDEO, interplay_video);

4
libavcodec/avcodec.h
View File

@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 51
#define LIBAVCODEC_VERSION_MINOR 52
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -204,6 +204,8 @@ enum CodecID {
CODEC_ID_R210,
CODEC_ID_ANM,
CODEC_ID_BINKVIDEO,
CODEC_ID_IFF_ILBM,
CODEC_ID_IFF_BYTERUN1,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,

223
libavcodec/iff.c Normal file
View File

@ -0,0 +1,223 @@
/*
* IFF PBM/ILBM bitmap decoder
* Copyright (c) 2010 Peter Ross <pross@xvid.org>
*
* This file is part of FFmpeg.
*
* 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.
*
* 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file libavcodec/iff.c
* IFF PBM/ILBM bitmap decoder
*/
#include "bytestream.h"
#include "avcodec.h"
/**
* Convert CMAP buffer (stored in extradata) to lavc palette format
*/
int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{
int count, i;
if (avctx->bits_per_coded_sample > 8) {
av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n");
return AVERROR_INVALIDDATA;
}
count = 1 << avctx->bits_per_coded_sample;
if (avctx->extradata_size < count * 3) {
av_log(avctx, AV_LOG_ERROR, "palette data underflow\n");
return AVERROR_INVALIDDATA;
}
for (i=0; i < count; i++) {
pal[i] = AV_RB24( avctx->extradata + i*3 );
}
return 0;
}
static av_cold int decode_init(AVCodecContext *avctx)
{
AVFrame *frame = avctx->priv_data;
avctx->pix_fmt = PIX_FMT_PAL8;
frame->reference = 1;
if (avctx->get_buffer(avctx, frame) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return AVERROR_UNKNOWN;
}
return ff_cmap_read_palette(avctx, (uint32_t*)frame->data[1]);
}
/**
* Interleaved memcpy
*/
static void imemcpy(uint8_t *dst, const uint8_t const *buf, int x, int bps, int plane, int length)
{
int i, b;
for(i = 0; i < length; i++) {
int value = buf[i];
for (b = 0; b < bps; b++) {
if (value & (1<<b))
dst[ (x+i)*bps + 7 - b] |= 1<<plane;
}
}
}
/**
* Interleaved memset
*/
static void imemset(uint8_t *dst, int value, int x, int bps, int plane, int length)
{
int i, b;
for(i = 0; i < length; i++) {
for (b = 0; b < bps; b++) {
if (value & (1<<b))
dst[ (x+i)*bps + 7 - b] |= 1<<plane;
}
}
}
static int decode_frame_ilbm(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
{
AVFrame *frame = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
int planewidth = avctx->width / avctx->bits_per_coded_sample;
int y, plane;
if (avctx->reget_buffer(avctx, frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
if (buf_size < avctx->width * avctx->height) {
av_log(avctx, AV_LOG_ERROR, "buffer underflow\n");
return -1;
}
for(y = 0; y < avctx->height; y++ ) {
uint8_t *row = &frame->data[0][ y*frame->linesize[0] ];
memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
imemcpy(row, buf, 0, avctx->bits_per_coded_sample, plane, planewidth);
buf += planewidth;
}
}
*data_size = sizeof(AVFrame);
*(AVFrame*)data = *frame;
return buf_size;
}
static int decode_frame_byterun1(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
{
AVFrame *frame = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
int planewidth = avctx->width / avctx->bits_per_coded_sample;
int y, plane, x;
if (avctx->reget_buffer(avctx, frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &frame->data[0][ y*frame->linesize[0] ];
if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved
memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
for(x = 0; x < planewidth && buf < buf_end; ) {
char value = *buf++;
int length;
if (value >= 0) {
length = value + 1;
imemcpy(row, buf, x, avctx->bits_per_coded_sample, plane, FFMIN3(length, buf_end - buf, planewidth - x));
buf += length;
} else if (value > -128) {
length = -value + 1;
imemset(row, *buf++, x, avctx->bits_per_coded_sample, plane, FFMIN(length, planewidth - x));
} else { //noop
continue;
}
x += length;
}
}
} else {
for(x = 0; x < avctx->width && buf < buf_end; ) {
char value = *buf++;
int 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;
}
}
}
*data_size = sizeof(AVFrame);
*(AVFrame*)data = *frame;
return buf_size;
}
static av_cold int decode_end(AVCodecContext *avctx)
{
AVFrame *frame = avctx->priv_data;
if (frame->data[0])
avctx->release_buffer(avctx, frame);
return 0;
}
AVCodec iff_ilbm_decoder = {
"iff_ilbm",
CODEC_TYPE_VIDEO,
CODEC_ID_IFF_ILBM,
sizeof(AVFrame),
decode_init,
NULL,
decode_end,
decode_frame_ilbm,
CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
};
AVCodec iff_byterun1_decoder = {
"iff_byterun1",
CODEC_TYPE_VIDEO,
CODEC_ID_IFF_BYTERUN1,
sizeof(AVFrame),
decode_init,
NULL,
decode_end,
decode_frame_byterun1,
CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
};