From b4abe1d198ac5542b4f87a357134f14c7fbf7baa Mon Sep 17 00:00:00 2001 From: Ivo van Poorten Date: Wed, 26 Dec 2007 22:17:46 +0000 Subject: [PATCH] PC Paintbrush PCX image decoder Originally committed as revision 11321 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/pcx.c | 246 +++++++++++++++++++++++++++++++++++++++++ libavformat/img2.c | 1 + 5 files changed, 250 insertions(+) create mode 100644 libavcodec/pcx.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cee870961f..018aabcc85 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -134,6 +134,7 @@ OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_PAM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PBM_ENCODER) += pnmenc.o pnm.o +OBJS-$(CONFIG_PCX_DECODER) += pcx.o OBJS-$(CONFIG_PGM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d9c44d4ba2..e0d30041ec 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -118,6 +118,7 @@ void avcodec_register_all(void) REGISTER_DECODER (NUV, nuv); REGISTER_ENCODER (PAM, pam); REGISTER_ENCODER (PBM, pbm); + REGISTER_DECODER (PCX, pcx); REGISTER_ENCODER (PGM, pgm); REGISTER_ENCODER (PGMYUV, pgmyuv); REGISTER_ENCDEC (PNG, png); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ac325a6f4e..95ed9e6b01 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -169,6 +169,7 @@ enum CodecID { CODEC_ID_VP6A, CODEC_ID_AMV, CODEC_ID_VB, + CODEC_ID_PCX, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c new file mode 100644 index 0000000000..af92b27704 --- /dev/null +++ b/libavcodec/pcx.c @@ -0,0 +1,246 @@ +/* + * PC Paintbrush PCX (.pcx) image decoder + * Copyright (c) 2007, 2008 Ivo van Poorten + * + * This decoder does not support CGA palettes. I am unable to find samples + * and Netpbm cannot generate them. + * + * 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 + */ + +#include "avcodec.h" +#include "bytestream.h" +#include "bitstream.h" + +typedef struct PCXContext { + AVFrame picture; +} PCXContext; + +static int pcx_init(AVCodecContext *avctx) { + PCXContext *s = avctx->priv_data; + + avcodec_get_frame_defaults(&s->picture); + avctx->coded_frame= &s->picture; + + return 0; +} + +/** + * @return advanced src pointer + */ +static char *pcx_rle_decode(uint8_t *src, uint8_t *dst, + unsigned int bytes_per_scanline) { + unsigned int i = 0; + unsigned char run, value; + + while (i= 0xc0) { + run = value & 0x3f; + value = *src++; + } + while (ipriv_data; + AVFrame *picture = data; + AVFrame * const p = (AVFrame *)&s->picture; + int xmin, ymin, xmax, ymax; + unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x, + bytes_per_scanline; + uint8_t *ptr, *bufstart = buf; + + if (buf[0] != 0x0a || buf[1] > 5 || buf[1] == 1 || buf[2] != 1) { + av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n"); + return -1; + } + + xmin = AV_RL16(buf+ 4); + ymin = AV_RL16(buf+ 6); + xmax = AV_RL16(buf+ 8); + ymax = AV_RL16(buf+10); + + if (xmax < xmin || ymax < ymin) { + av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n"); + return -1; + } + + w = xmax - xmin + 1; + h = ymax - ymin + 1; + + bits_per_pixel = buf[3]; + bytes_per_line = AV_RL16(buf+66); + nplanes = buf[65]; + bytes_per_scanline = nplanes * bytes_per_line; + + if (bytes_per_scanline < w * bits_per_pixel * nplanes / 8) { + av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n"); + return -1; + } + + switch ((nplanes<<8) + bits_per_pixel) { + case 0x0308: + avctx->pix_fmt = PIX_FMT_RGB24; + break; + case 0x0108: + case 0x0104: + case 0x0102: + case 0x0101: + case 0x0401: + case 0x0301: + case 0x0201: + avctx->pix_fmt = PIX_FMT_PAL8; + break; + default: + av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n"); + return -1; + } + + buf += 128; + + if (p->data[0]) + avctx->release_buffer(avctx, p); + + if (avcodec_check_dimensions(avctx, w, h)) + return -1; + if (w != avctx->width || h != avctx->height) + avcodec_set_dimensions(avctx, w, h); + if (avctx->get_buffer(avctx, p) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + + p->pict_type = FF_I_TYPE; + + ptr = p->data[0]; + stride = p->linesize[0]; + + if (nplanes == 3 && bits_per_pixel == 8) { + uint8_t scanline[bytes_per_scanline]; + + for (y=0; y> (x&7), v = 0; + for (i=nplanes - 1; i>=0; i--) { + v <<= 1; + v += !!(scanline[i*bytes_per_line + (x>>3)] & m); + } + ptr[x] = v; + } + ptr += stride; + } + } + + if (nplanes == 1 && bits_per_pixel == 8) { + pcx_palette(&buf, (uint32_t *) p->data[1], 256); + } else if (bits_per_pixel < 8) { + uint8_t *palette = bufstart+16; + pcx_palette(&palette, (uint32_t *) p->data[1], 16); + } + + *picture = s->picture; + *data_size = sizeof(AVFrame); + + return buf - bufstart; +} + +static int pcx_end(AVCodecContext *avctx) { + PCXContext *s = avctx->priv_data; + + if(s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + + return 0; +} + +AVCodec pcx_decoder = { + "pcx", + CODEC_TYPE_VIDEO, + CODEC_ID_PCX, + sizeof(PCXContext), + pcx_init, + NULL, + pcx_end, + pcx_decode_frame, + 0, + NULL +}; diff --git a/libavformat/img2.c b/libavformat/img2.c index 42a2d61e5a..8ed7837067 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -57,6 +57,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_TIFF , "tiff"}, { CODEC_ID_SGI , "sgi"}, { CODEC_ID_PTX , "ptx"}, + { CODEC_ID_PCX , "pcx"}, {0, NULL} };