mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-22 06:50:12 +01:00
* 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>
265 lines
8.7 KiB
C
265 lines
8.7 KiB
C
/*
|
|
* Pictor/PC Paint 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
|
|
* Pictor/PC Paint decoder
|
|
*/
|
|
|
|
#include "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "cga_data.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct PicContext {
|
|
int width, height;
|
|
int nb_planes;
|
|
GetByteContext g;
|
|
} PicContext;
|
|
|
|
static void picmemset_8bpp(PicContext *s, AVFrame *frame, int value, int run,
|
|
int *x, int *y)
|
|
{
|
|
while (run > 0) {
|
|
uint8_t *d = frame->data[0] + *y * frame->linesize[0];
|
|
if (*x + run >= s->width) {
|
|
int n = s->width - *x;
|
|
memset(d + *x, value, n);
|
|
run -= n;
|
|
*x = 0;
|
|
*y -= 1;
|
|
if (*y < 0)
|
|
break;
|
|
} else {
|
|
memset(d + *x, value, run);
|
|
*x += run;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void picmemset(PicContext *s, AVFrame *frame, int value, int run,
|
|
int *x, int *y, int *plane, int bits_per_plane)
|
|
{
|
|
uint8_t *d;
|
|
int shift = *plane * bits_per_plane;
|
|
int mask = ((1 << bits_per_plane) - 1) << shift;
|
|
value <<= shift;
|
|
|
|
while (run > 0) {
|
|
int j;
|
|
for (j = 8-bits_per_plane; j >= 0; j -= bits_per_plane) {
|
|
d = frame->data[0] + *y * frame->linesize[0];
|
|
d[*x] |= (value >> j) & mask;
|
|
*x += 1;
|
|
if (*x == s->width) {
|
|
*y -= 1;
|
|
*x = 0;
|
|
if (*y < 0) {
|
|
*y = s->height - 1;
|
|
*plane += 1;
|
|
value <<= bits_per_plane;
|
|
mask <<= bits_per_plane;
|
|
if (*plane >= s->nb_planes)
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
run--;
|
|
}
|
|
}
|
|
|
|
static const uint8_t cga_mode45_index[6][4] = {
|
|
[0] = { 0, 3, 5, 7 }, // mode4, palette#1, low intensity
|
|
[1] = { 0, 2, 4, 6 }, // mode4, palette#2, low intensity
|
|
[2] = { 0, 3, 4, 7 }, // mode5, low intensity
|
|
[3] = { 0, 11, 13, 15 }, // mode4, palette#1, high intensity
|
|
[4] = { 0, 10, 12, 14 }, // mode4, palette#2, high intensity
|
|
[5] = { 0, 11, 12, 15 }, // mode5, high intensity
|
|
};
|
|
|
|
static int decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
PicContext *s = avctx->priv_data;
|
|
AVFrame *frame = data;
|
|
uint32_t *palette;
|
|
int bits_per_plane, bpp, etype, esize, npal, pos_after_pal;
|
|
int i, x, y, plane, tmp, ret, val;
|
|
|
|
bytestream2_init(&s->g, avpkt->data, avpkt->size);
|
|
|
|
if (bytestream2_get_bytes_left(&s->g) < 11)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
if (bytestream2_get_le16u(&s->g) != 0x1234)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
s->width = bytestream2_get_le16u(&s->g);
|
|
s->height = bytestream2_get_le16u(&s->g);
|
|
bytestream2_skip(&s->g, 4);
|
|
tmp = bytestream2_get_byteu(&s->g);
|
|
bits_per_plane = tmp & 0xF;
|
|
s->nb_planes = (tmp >> 4) + 1;
|
|
bpp = bits_per_plane * s->nb_planes;
|
|
if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
|
|
av_log_ask_for_sample(avctx, "unsupported bit depth\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
if (bytestream2_peek_byte(&s->g) == 0xFF || bpp == 1 || bpp == 4 || bpp == 8) {
|
|
bytestream2_skip(&s->g, 2);
|
|
etype = bytestream2_get_le16(&s->g);
|
|
esize = bytestream2_get_le16(&s->g);
|
|
if (bytestream2_get_bytes_left(&s->g) < esize)
|
|
return AVERROR_INVALIDDATA;
|
|
} else {
|
|
etype = -1;
|
|
esize = 0;
|
|
}
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
|
|
if (s->width != avctx->width && s->height != avctx->height) {
|
|
if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
|
|
return -1;
|
|
avcodec_set_dimensions(avctx, s->width, s->height);
|
|
}
|
|
|
|
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
memset(frame->data[0], 0, s->height * frame->linesize[0]);
|
|
frame->pict_type = AV_PICTURE_TYPE_I;
|
|
frame->palette_has_changed = 1;
|
|
|
|
pos_after_pal = bytestream2_tell(&s->g) + esize;
|
|
palette = (uint32_t*)frame->data[1];
|
|
if (etype == 1 && esize > 1 && bytestream2_peek_byte(&s->g) < 6) {
|
|
int idx = bytestream2_get_byte(&s->g);
|
|
npal = 4;
|
|
for (i = 0; i < npal; i++)
|
|
palette[i] = ff_cga_palette[ cga_mode45_index[idx][i] ];
|
|
} else if (etype == 2) {
|
|
npal = FFMIN(esize, 16);
|
|
for (i = 0; i < npal; i++) {
|
|
int pal_idx = bytestream2_get_byte(&s->g);
|
|
palette[i] = ff_cga_palette[FFMIN(pal_idx, 15)];
|
|
}
|
|
} else if (etype == 3) {
|
|
npal = FFMIN(esize, 16);
|
|
for (i = 0; i < npal; i++) {
|
|
int pal_idx = bytestream2_get_byte(&s->g);
|
|
palette[i] = ff_ega_palette[FFMIN(pal_idx, 63)];
|
|
}
|
|
} else if (etype == 4 || etype == 5) {
|
|
npal = FFMIN(esize / 3, 256);
|
|
for (i = 0; i < npal; i++) {
|
|
palette[i] = bytestream2_get_be24(&s->g) << 2;
|
|
palette[i] |= 0xFFU << 24 | palette[i] >> 6 & 0x30303;
|
|
}
|
|
} else {
|
|
if (bpp == 1) {
|
|
npal = 2;
|
|
palette[0] = 0xFF000000;
|
|
palette[1] = 0xFFFFFFFF;
|
|
} else if (bpp == 2) {
|
|
npal = 4;
|
|
for (i = 0; i < npal; i++)
|
|
palette[i] = ff_cga_palette[ cga_mode45_index[0][i] ];
|
|
} else {
|
|
npal = 16;
|
|
memcpy(palette, ff_cga_palette, npal * 4);
|
|
}
|
|
}
|
|
// fill remaining palette entries
|
|
memset(palette + npal, 0, AVPALETTE_SIZE - npal * 4);
|
|
// skip remaining palette bytes
|
|
bytestream2_seek(&s->g, pos_after_pal, SEEK_SET);
|
|
|
|
val = 0;
|
|
y = s->height - 1;
|
|
if (bytestream2_get_le16(&s->g)) {
|
|
x = 0;
|
|
plane = 0;
|
|
while (y >= 0 && bytestream2_get_bytes_left(&s->g) >= 6) {
|
|
int stop_size, marker, t1, t2;
|
|
|
|
t1 = bytestream2_get_bytes_left(&s->g);
|
|
t2 = bytestream2_get_le16(&s->g);
|
|
stop_size = t1 - FFMIN(t1, t2);
|
|
// ignore uncompressed block size
|
|
bytestream2_skip(&s->g, 2);
|
|
marker = bytestream2_get_byte(&s->g);
|
|
|
|
while (plane < s->nb_planes && y >= 0 &&
|
|
bytestream2_get_bytes_left(&s->g) > stop_size) {
|
|
int run = 1;
|
|
val = bytestream2_get_byte(&s->g);
|
|
if (val == marker) {
|
|
run = bytestream2_get_byte(&s->g);
|
|
if (run == 0)
|
|
run = bytestream2_get_le16(&s->g);
|
|
val = bytestream2_get_byte(&s->g);
|
|
}
|
|
if (!bytestream2_get_bytes_left(&s->g))
|
|
break;
|
|
|
|
if (bits_per_plane == 8) {
|
|
picmemset_8bpp(s, frame, val, run, &x, &y);
|
|
} else {
|
|
picmemset(s, frame, val, run, &x, &y, &plane, bits_per_plane);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (x < avctx->width && y >= 0) {
|
|
int run = (y + 1) * avctx->width - x;
|
|
if (bits_per_plane == 8)
|
|
picmemset_8bpp(s, frame, val, run, &x, &y);
|
|
else
|
|
picmemset(s, frame, val, run / (8 / bits_per_plane), &x, &y, &plane, bits_per_plane);
|
|
}
|
|
} else {
|
|
while (y >= 0 && bytestream2_get_bytes_left(&s->g) > 0) {
|
|
memcpy(frame->data[0] + y * frame->linesize[0], s->g.buffer, FFMIN(avctx->width, bytestream2_get_bytes_left(&s->g)));
|
|
bytestream2_skip(&s->g, avctx->width);
|
|
y--;
|
|
}
|
|
}
|
|
|
|
*got_frame = 1;
|
|
return avpkt->size;
|
|
}
|
|
|
|
AVCodec ff_pictor_decoder = {
|
|
.name = "pictor",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PICTOR,
|
|
.priv_data_size = sizeof(PicContext),
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
|
|
};
|