* commit '759001c534287a96dc96d1e274665feb7059145d':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '759001c534287a96dc96d1e274665feb7059145d'
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
237 lines
7.3 KiB
C
237 lines
7.3 KiB
C
/*
|
|
* 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 "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
static void pcx_rle_decode(GetByteContext *gb, uint8_t *dst,
|
|
unsigned int bytes_per_scanline, int compressed)
|
|
{
|
|
unsigned int i = 0;
|
|
unsigned char run, value;
|
|
|
|
if (compressed) {
|
|
while (i<bytes_per_scanline) {
|
|
run = 1;
|
|
value = bytestream2_get_byte(gb);
|
|
if (value >= 0xc0) {
|
|
run = value & 0x3f;
|
|
value = bytestream2_get_byte(gb);
|
|
}
|
|
while (i<bytes_per_scanline && run--)
|
|
dst[i++] = value;
|
|
}
|
|
} else {
|
|
bytestream2_get_buffer(gb, dst, bytes_per_scanline);
|
|
}
|
|
}
|
|
|
|
static void pcx_palette(GetByteContext *gb, uint32_t *dst, int pallen)
|
|
{
|
|
int i;
|
|
|
|
pallen = FFMIN(pallen, bytestream2_get_bytes_left(gb) / 3);
|
|
for (i=0; i<pallen; i++)
|
|
*dst++ = 0xFF000000 | bytestream2_get_be24u(gb);
|
|
if (pallen < 256)
|
|
memset(dst, 0, (256 - pallen) * sizeof(*dst));
|
|
}
|
|
|
|
static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
|
AVPacket *avpkt) {
|
|
GetByteContext gb;
|
|
AVFrame * const p = data;
|
|
int compressed, xmin, ymin, xmax, ymax, ret;
|
|
unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
|
|
bytes_per_scanline;
|
|
uint8_t *ptr, *scanline;
|
|
|
|
if (avpkt->size < 128)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
bytestream2_init(&gb, avpkt->data, avpkt->size);
|
|
|
|
if (bytestream2_get_byteu(&gb) != 0x0a || bytestream2_get_byteu(&gb) > 5) {
|
|
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
compressed = bytestream2_get_byteu(&gb);
|
|
bits_per_pixel = bytestream2_get_byteu(&gb);
|
|
xmin = bytestream2_get_le16u(&gb);
|
|
ymin = bytestream2_get_le16u(&gb);
|
|
xmax = bytestream2_get_le16u(&gb);
|
|
ymax = bytestream2_get_le16u(&gb);
|
|
avctx->sample_aspect_ratio.num = bytestream2_get_le16u(&gb);
|
|
avctx->sample_aspect_ratio.den = bytestream2_get_le16u(&gb);
|
|
|
|
if (xmax < xmin || ymax < ymin) {
|
|
av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
w = xmax - xmin + 1;
|
|
h = ymax - ymin + 1;
|
|
|
|
bytestream2_skipu(&gb, 49);
|
|
nplanes = bytestream2_get_byteu(&gb);
|
|
bytes_per_line = bytestream2_get_le16u(&gb);
|
|
bytes_per_scanline = nplanes * bytes_per_line;
|
|
|
|
if (bytes_per_scanline < (w * bits_per_pixel * nplanes + 7) / 8) {
|
|
av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
switch ((nplanes<<8) + bits_per_pixel) {
|
|
case 0x0308:
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
|
break;
|
|
case 0x0108:
|
|
case 0x0104:
|
|
case 0x0102:
|
|
case 0x0101:
|
|
case 0x0401:
|
|
case 0x0301:
|
|
case 0x0201:
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
bytestream2_skipu(&gb, 60);
|
|
|
|
if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
|
|
return ret;
|
|
if (w != avctx->width || h != avctx->height)
|
|
avcodec_set_dimensions(avctx, w, h);
|
|
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
p->pict_type = AV_PICTURE_TYPE_I;
|
|
|
|
ptr = p->data[0];
|
|
stride = p->linesize[0];
|
|
|
|
scanline = av_malloc(bytes_per_scanline + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
if (!scanline)
|
|
return AVERROR(ENOMEM);
|
|
|
|
if (nplanes == 3 && bits_per_pixel == 8) {
|
|
for (y=0; y<h; y++) {
|
|
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
|
|
|
|
for (x=0; x<w; x++) {
|
|
ptr[3*x ] = scanline[x ];
|
|
ptr[3*x+1] = scanline[x+ bytes_per_line ];
|
|
ptr[3*x+2] = scanline[x+(bytes_per_line<<1)];
|
|
}
|
|
|
|
ptr += stride;
|
|
}
|
|
|
|
} else if (nplanes == 1 && bits_per_pixel == 8) {
|
|
int palstart = avpkt->size - 769;
|
|
|
|
for (y=0; y<h; y++, ptr+=stride) {
|
|
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
|
|
memcpy(ptr, scanline, w);
|
|
}
|
|
|
|
if (bytestream2_tell(&gb) != palstart) {
|
|
av_log(avctx, AV_LOG_WARNING, "image data possibly corrupted\n");
|
|
bytestream2_seek(&gb, palstart, SEEK_SET);
|
|
}
|
|
if (bytestream2_get_byte(&gb) != 12) {
|
|
av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
|
|
ret = AVERROR_INVALIDDATA;
|
|
goto end;
|
|
}
|
|
|
|
} else if (nplanes == 1) { /* all packed formats, max. 16 colors */
|
|
GetBitContext s;
|
|
|
|
for (y=0; y<h; y++) {
|
|
init_get_bits8(&s, scanline, bytes_per_scanline);
|
|
|
|
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
|
|
|
|
for (x=0; x<w; x++)
|
|
ptr[x] = get_bits(&s, bits_per_pixel);
|
|
ptr += stride;
|
|
}
|
|
|
|
} else { /* planar, 4, 8 or 16 colors */
|
|
int i;
|
|
|
|
for (y=0; y<h; y++) {
|
|
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
|
|
|
|
for (x=0; x<w; x++) {
|
|
int m = 0x80 >> (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;
|
|
}
|
|
}
|
|
|
|
ret = bytestream2_tell(&gb);
|
|
if (nplanes == 1 && bits_per_pixel == 8) {
|
|
pcx_palette(&gb, (uint32_t *) p->data[1], 256);
|
|
ret += 256 * 3;
|
|
} else if (bits_per_pixel * nplanes == 1) {
|
|
AV_WN32A(p->data[1] , 0xFF000000);
|
|
AV_WN32A(p->data[1]+4, 0xFFFFFFFF);
|
|
} else if (bits_per_pixel < 8) {
|
|
bytestream2_seek(&gb, 16, SEEK_SET);
|
|
pcx_palette(&gb, (uint32_t *) p->data[1], 16);
|
|
}
|
|
|
|
*got_frame = 1;
|
|
|
|
end:
|
|
av_free(scanline);
|
|
return ret;
|
|
}
|
|
|
|
AVCodec ff_pcx_decoder = {
|
|
.name = "pcx",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PCX,
|
|
.decode = pcx_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
|
|
};
|