* This decoder does not support CGA palettes. I am unable to find samples
* and Netpbm cannot generate them.
*
- * 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
*/
+#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
-#include "bitstream.h"
+#include "get_bits.h"
typedef struct PCXContext {
AVFrame picture;
} PCXContext;
-static int pcx_init(AVCodecContext *avctx) {
+static av_cold int pcx_init(AVCodecContext *avctx) {
PCXContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture);
/**
* @return advanced src pointer
*/
-static const char *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
- unsigned int bytes_per_scanline) {
+static const uint8_t *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
+ unsigned int bytes_per_scanline, int compressed) {
unsigned int i = 0;
unsigned char run, value;
- while (i<bytes_per_scanline) {
- run = 1;
- value = *src++;
- if (value >= 0xc0) {
- run = value & 0x3f;
+ if (compressed) {
+ while (i<bytes_per_scanline) {
+ run = 1;
value = *src++;
+ if (value >= 0xc0) {
+ run = value & 0x3f;
+ value = *src++;
+ }
+ while (i<bytes_per_scanline && run--)
+ dst[i++] = value;
}
- while (i<bytes_per_scanline && run--)
- dst[i++] = value;
+ } else {
+ memcpy(dst, src, bytes_per_scanline);
+ src += bytes_per_scanline;
}
return src;
for (i=0; i<pallen; i++)
*dst++ = bytestream_get_be24(src);
- memset(dst, 0, (256 - pallen) * sizeof(*dst));
+ if (pallen < 256)
+ memset(dst, 0, (256 - pallen) * sizeof(*dst));
}
static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- const uint8_t *buf, int buf_size) {
+ AVPacket *avpkt) {
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
PCXContext * const s = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p = &s->picture;
- int xmin, ymin, xmax, ymax;
+ int compressed, xmin, ymin, xmax, ymax;
unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
bytes_per_scanline;
uint8_t *ptr;
uint8_t const *bufstart = buf;
+ uint8_t *scanline;
+ int ret = -1;
- if (buf[0] != 0x0a || buf[1] > 5 || buf[1] == 1 || buf[2] != 1) {
+ if (buf[0] != 0x0a || buf[1] > 5) {
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
return -1;
}
+ compressed = buf[2];
xmin = AV_RL16(buf+ 4);
ymin = AV_RL16(buf+ 6);
xmax = AV_RL16(buf+ 8);
switch ((nplanes<<8) + bits_per_pixel) {
case 0x0308:
- avctx->pix_fmt = PIX_FMT_RGB24;
+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
break;
case 0x0108:
case 0x0104:
case 0x0401:
case 0x0301:
case 0x0201:
- avctx->pix_fmt = PIX_FMT_PAL8;
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
if (p->data[0])
avctx->release_buffer(avctx, p);
- if (avcodec_check_dimensions(avctx, w, h))
+ if (av_image_check_size(w, h, 0, avctx))
return -1;
if (w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h);
return -1;
}
- p->pict_type = FF_I_TYPE;
+ p->pict_type = AV_PICTURE_TYPE_I;
ptr = p->data[0];
stride = p->linesize[0];
- if (nplanes == 3 && bits_per_pixel == 8) {
- uint8_t scanline[bytes_per_scanline];
+ scanline = av_malloc(bytes_per_scanline);
+ if (!scanline)
+ return AVERROR(ENOMEM);
+ if (nplanes == 3 && bits_per_pixel == 8) {
for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
for (x=0; x<w; x++) {
ptr[3*x ] = scanline[x ];
}
} else if (nplanes == 1 && bits_per_pixel == 8) {
- uint8_t scanline[bytes_per_scanline];
const uint8_t *palstart = bufstart + buf_size - 769;
for (y=0; y<h; y++, ptr+=stride) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
memcpy(ptr, scanline, w);
}
}
if (*buf++ != 12) {
av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
- return -1;
+ goto end;
}
} else if (nplanes == 1) { /* all packed formats, max. 16 colors */
- uint8_t scanline[bytes_per_scanline];
GetBitContext s;
for (y=0; y<h; y++) {
init_get_bits(&s, scanline, bytes_per_scanline<<3);
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
for (x=0; x<w; x++)
ptr[x] = get_bits(&s, bits_per_pixel);
}
} else { /* planar, 4, 8 or 16 colors */
- uint8_t scanline[bytes_per_scanline];
int i;
for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
for (x=0; x<w; x++) {
int m = 0x80 >> (x&7), v = 0;
*picture = s->picture;
*data_size = sizeof(AVFrame);
- return buf - bufstart;
+ ret = buf - bufstart;
+end:
+ av_free(scanline);
+ return ret;
}
-static int pcx_end(AVCodecContext *avctx) {
+static av_cold int pcx_end(AVCodecContext *avctx) {
PCXContext *s = avctx->priv_data;
if(s->picture.data[0])
return 0;
}
-AVCodec pcx_decoder = {
- "pcx",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PCX,
- sizeof(PCXContext),
- pcx_init,
- NULL,
- pcx_end,
- pcx_decode_frame,
- 0,
- NULL
+AVCodec ff_pcx_decoder = {
+ .name = "pcx",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_PCX,
+ .priv_data_size = sizeof(PCXContext),
+ .init = pcx_init,
+ .close = pcx_end,
+ .decode = pcx_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
};
projects / ffmpeg / blobdiff