* 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>
261 lines
7.6 KiB
C
261 lines
7.6 KiB
C
/*
|
|
* Binary text decoder
|
|
* eXtended BINary text (XBIN) decoder
|
|
* iCEDraw File 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
|
|
* Binary text decoder
|
|
* eXtended BINary text (XBIN) decoder
|
|
* iCEDraw File decoder
|
|
*/
|
|
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "libavutil/xga_font_data.h"
|
|
#include "avcodec.h"
|
|
#include "cga_data.h"
|
|
#include "bintext.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct XbinContext {
|
|
AVFrame *frame;
|
|
int palette[16];
|
|
int flags;
|
|
int font_height;
|
|
const uint8_t *font;
|
|
int x, y;
|
|
} XbinContext;
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
XbinContext *s = avctx->priv_data;
|
|
uint8_t *p;
|
|
int i;
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
p = avctx->extradata;
|
|
if (p) {
|
|
s->font_height = p[0];
|
|
s->flags = p[1];
|
|
p += 2;
|
|
if(avctx->extradata_size < 2 + (!!(s->flags & BINTEXT_PALETTE))*3*16
|
|
+ (!!(s->flags & BINTEXT_FONT))*s->font_height*256) {
|
|
av_log(avctx, AV_LOG_ERROR, "not enough extradata\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
} else {
|
|
s->font_height = 8;
|
|
s->flags = 0;
|
|
}
|
|
|
|
if ((s->flags & BINTEXT_PALETTE)) {
|
|
for (i = 0; i < 16; i++) {
|
|
s->palette[i] = 0xFF000000 | (AV_RB24(p) << 2) | ((AV_RB24(p) >> 4) & 0x30303);
|
|
p += 3;
|
|
}
|
|
} else {
|
|
for (i = 0; i < 16; i++)
|
|
s->palette[i] = 0xFF000000 | ff_cga_palette[i];
|
|
}
|
|
|
|
if ((s->flags & BINTEXT_FONT)) {
|
|
s->font = p;
|
|
} else {
|
|
switch(s->font_height) {
|
|
default:
|
|
av_log(avctx, AV_LOG_WARNING, "font height %i not supported\n", s->font_height);
|
|
s->font_height = 8;
|
|
case 8:
|
|
s->font = avpriv_cga_font;
|
|
break;
|
|
case 16:
|
|
s->font = avpriv_vga16_font;
|
|
break;
|
|
}
|
|
}
|
|
|
|
s->frame = av_frame_alloc();
|
|
if (!s->frame)
|
|
return AVERROR(ENOMEM);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define DEFAULT_BG_COLOR 0
|
|
av_unused static void hscroll(AVCodecContext *avctx)
|
|
{
|
|
XbinContext *s = avctx->priv_data;
|
|
if (s->y < avctx->height - s->font_height) {
|
|
s->y += s->font_height;
|
|
} else {
|
|
memmove(s->frame->data[0], s->frame->data[0] + s->font_height*s->frame->linesize[0],
|
|
(avctx->height - s->font_height)*s->frame->linesize[0]);
|
|
memset(s->frame->data[0] + (avctx->height - s->font_height)*s->frame->linesize[0],
|
|
DEFAULT_BG_COLOR, s->font_height * s->frame->linesize[0]);
|
|
}
|
|
}
|
|
|
|
#define FONT_WIDTH 8
|
|
|
|
/**
|
|
* Draw character to screen
|
|
*/
|
|
static void draw_char(AVCodecContext *avctx, int c, int a)
|
|
{
|
|
XbinContext *s = avctx->priv_data;
|
|
if (s->y > avctx->height - s->font_height)
|
|
return;
|
|
ff_draw_pc_font(s->frame->data[0] + s->y * s->frame->linesize[0] + s->x,
|
|
s->frame->linesize[0], s->font, s->font_height, c,
|
|
a & 0x0F, a >> 4);
|
|
s->x += FONT_WIDTH;
|
|
if (s->x > avctx->width - FONT_WIDTH) {
|
|
s->x = 0;
|
|
s->y += s->font_height;
|
|
}
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
XbinContext *s = avctx->priv_data;
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
const uint8_t *buf_end = buf+buf_size;
|
|
int ret;
|
|
|
|
s->x = s->y = 0;
|
|
if (ff_reget_buffer(avctx, s->frame) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return -1;
|
|
}
|
|
s->frame->pict_type = AV_PICTURE_TYPE_I;
|
|
s->frame->palette_has_changed = 1;
|
|
memcpy(s->frame->data[1], s->palette, 16 * 4);
|
|
|
|
if (avctx->codec_id == AV_CODEC_ID_XBIN) {
|
|
while (buf + 2 < buf_end) {
|
|
int i,c,a;
|
|
int type = *buf >> 6;
|
|
int count = (*buf & 0x3F) + 1;
|
|
buf++;
|
|
switch (type) {
|
|
case 0: //no compression
|
|
for (i = 0; i < count && buf + 1 < buf_end; i++) {
|
|
draw_char(avctx, buf[0], buf[1]);
|
|
buf += 2;
|
|
}
|
|
break;
|
|
case 1: //character compression
|
|
c = *buf++;
|
|
for (i = 0; i < count && buf < buf_end; i++)
|
|
draw_char(avctx, c, *buf++);
|
|
break;
|
|
case 2: //attribute compression
|
|
a = *buf++;
|
|
for (i = 0; i < count && buf < buf_end; i++)
|
|
draw_char(avctx, *buf++, a);
|
|
break;
|
|
case 3: //character/attribute compression
|
|
c = *buf++;
|
|
a = *buf++;
|
|
for (i = 0; i < count && buf < buf_end; i++)
|
|
draw_char(avctx, c, a);
|
|
break;
|
|
}
|
|
}
|
|
} else if (avctx->codec_id == AV_CODEC_ID_IDF) {
|
|
while (buf + 2 < buf_end) {
|
|
if (AV_RL16(buf) == 1) {
|
|
int i;
|
|
if (buf + 6 > buf_end)
|
|
break;
|
|
for (i = 0; i < buf[2]; i++)
|
|
draw_char(avctx, buf[4], buf[5]);
|
|
buf += 6;
|
|
} else {
|
|
draw_char(avctx, buf[0], buf[1]);
|
|
buf += 2;
|
|
}
|
|
}
|
|
} else {
|
|
while (buf + 1 < buf_end) {
|
|
draw_char(avctx, buf[0], buf[1]);
|
|
buf += 2;
|
|
}
|
|
}
|
|
|
|
if ((ret = av_frame_ref(data, s->frame)) < 0)
|
|
return ret;
|
|
*got_frame = 1;
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx)
|
|
{
|
|
XbinContext *s = avctx->priv_data;
|
|
|
|
av_frame_free(&s->frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if CONFIG_BINTEXT_DECODER
|
|
AVCodec ff_bintext_decoder = {
|
|
.name = "bintext",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_BINTEXT,
|
|
.priv_data_size = sizeof(XbinContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Binary text"),
|
|
};
|
|
#endif
|
|
#if CONFIG_XBIN_DECODER
|
|
AVCodec ff_xbin_decoder = {
|
|
.name = "xbin",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_XBIN,
|
|
.priv_data_size = sizeof(XbinContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
|
|
};
|
|
#endif
|
|
#if CONFIG_IDF_DECODER
|
|
AVCodec ff_idf_decoder = {
|
|
.name = "idf",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_IDF,
|
|
.priv_data_size = sizeof(XbinContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
|
|
};
|
|
#endif
|