Skip to content

Commit

Permalink
support for Tiertex .seq files demuxing/video decoding, by Gregory Mo…
Browse files Browse the repository at this point in the history
…ntoir %cyx A users P sourceforge P net%

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6672 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
  • Loading branch information
bcoudurier committed Oct 12, 2006
1 parent 8404adb commit 5ea7965
Show file tree
Hide file tree
Showing 11 changed files with 556 additions and 4 deletions.
1 change: 1 addition & 0 deletions Changelog
Expand Up @@ -61,6 +61,7 @@ version <next>
- WavPack lossless audio decoder
- Targa (.TGA) picture decoder
- Delphine Software .cin demuxer/audio and video decoder
- Tiertex .seq demuxer/video decoder

version 0.4.9-pre1:

Expand Down
3 changes: 3 additions & 0 deletions doc/ffmpeg-doc.texi
Expand Up @@ -740,6 +740,8 @@ library:
@tab Multimedia format used by Delphine Software games.
@item MXF @tab @tab X
@tab Material eXchange Format SMPTE 377M, used by D-Cinema, broadcast industry.
@item SEQ @tab @tab X
@tab Tiertex .seq files used in the DOS CDROM version of the game Flashback.
@end multitable

@code{X} means that encoding (resp. decoding) is supported.
Expand Down Expand Up @@ -843,6 +845,7 @@ following image formats are supported:
@item KMVC @tab @tab X @tab Codec used in Worms games.
@item VMware Video @tab @tab X @tab Codec used in videos captured by VMware.
@item Cin Video @tab @tab X @tab Codec used in Delphine Software games.
@item Tiertex Seq Video @tab @tab X @tab Codec used in DOS CDROM FlashBack game.
@end multitable

@code{X} means that encoding (resp. decoding) is supported.
Expand Down
1 change: 1 addition & 0 deletions libavcodec/Makefile
Expand Up @@ -146,6 +146,7 @@ OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o vorbis_data.o
OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis_data.o
OBJS-$(CONFIG_VP3_DECODER) += vp3.o
Expand Down
3 changes: 3 additions & 0 deletions libavcodec/allcodecs.c
Expand Up @@ -554,6 +554,9 @@ void avcodec_register_all(void)
#ifdef CONFIG_DSICINAUDIO_DECODER
register_avcodec(&dsicinaudio_decoder);
#endif //CONFIG_DSICINAUDIO_DECODER
#ifdef CONFIG_TIERTEXSEQVIDEO_DECODER
register_avcodec(&tiertexseqvideo_decoder);
#endif //CONFIG_TIERTEXSEQVIDEO_DECODER

#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
#ifdef CONFIG_AMR_NB_DECODER
Expand Down
6 changes: 4 additions & 2 deletions libavcodec/avcodec.h
Expand Up @@ -37,8 +37,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s

#define LIBAVCODEC_VERSION_INT ((51<<16)+(18<<8)+0)
#define LIBAVCODEC_VERSION 51.18.0
#define LIBAVCODEC_VERSION_INT ((51<<16)+(19<<8)+0)
#define LIBAVCODEC_VERSION 51.19.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT

#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
Expand Down Expand Up @@ -146,6 +146,7 @@ enum CodecID {
CODEC_ID_VP6F,
CODEC_ID_TARGA,
CODEC_ID_DSICINVIDEO,
CODEC_ID_TIERTEXSEQVIDEO,

/* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
Expand Down Expand Up @@ -2298,6 +2299,7 @@ extern AVCodec wavpack_decoder;
extern AVCodec targa_decoder;
extern AVCodec dsicinvideo_decoder;
extern AVCodec dsicinaudio_decoder;
extern AVCodec tiertexseqvideo_decoder;

/* pcm codecs */
#define PCM_CODEC(id, name) \
Expand Down
232 changes: 232 additions & 0 deletions libavcodec/tiertexseqv.c
@@ -0,0 +1,232 @@
/*
* Tiertex Limited SEQ Video Decoder
* Copyright (c) 2006 Gregory Montoir (cyx@users.sourceforge.net)
*
* 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 tiertexseqv.c
* Tiertex Limited SEQ video decoder
*/

#include "avcodec.h"
#include "common.h"
#define ALT_BITSTREAM_READER_LE
#include "bitstream.h"


typedef struct SeqVideoContext {
AVCodecContext *avctx;
AVFrame frame;
unsigned int palette[256];
unsigned char block[8 * 8];
} SeqVideoContext;


static unsigned char *seq_unpack_rle_block(unsigned char *src, unsigned char *dst, int dst_size)
{
int i, len, sz;
GetBitContext gb;
int code_table[64];

/* get the rle codes (at most 64 bytes) */
init_get_bits(&gb, src, 64 * 8);
for (i = 0, sz = 0; i < 64 && sz < dst_size; i++) {
code_table[i] = get_sbits(&gb, 4);
sz += FFABS(code_table[i]);
}
src += (get_bits_count(&gb) + 7) / 8;

/* do the rle unpacking */
for (i = 0; i < 64 && dst_size > 0; i++) {
len = code_table[i];
if (len < 0) {
len = -len;
memset(dst, *src++, FFMIN(len, dst_size));
} else {
memcpy(dst, src, FFMIN(len, dst_size));
src += len;
}
dst += len;
dst_size -= len;
}
return src;
}

static unsigned char *seq_decode_op1(SeqVideoContext *seq, unsigned char *src, unsigned char *dst)
{
unsigned char *color_table;
int b, i, len, bits;
GetBitContext gb;

len = *src++;
if (len & 0x80) {
switch (len & 3) {
case 1:
src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block));
for (b = 0; b < 8; b++) {
memcpy(dst, &seq->block[b * 8], 8);
dst += seq->frame.linesize[0];
}
break;
case 2:
src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block));
for (i = 0; i < 8; i++) {
for (b = 0; b < 8; b++)
dst[b * seq->frame.linesize[0]] = seq->block[i * 8 + b];
++dst;
}
break;
}
} else {
color_table = src;
src += len;
bits = ff_log2_tab[len - 1] + 1;
init_get_bits(&gb, src, bits * 8 * 8); src += bits * 8;
for (b = 0; b < 8; b++) {
for (i = 0; i < 8; i++)
dst[i] = color_table[get_bits(&gb, bits)];
dst += seq->frame.linesize[0];
}
}

return src;
}

static unsigned char *seq_decode_op2(SeqVideoContext *seq, unsigned char *src, unsigned char *dst)
{
int i;

for (i = 0; i < 8; i++) {
memcpy(dst, src, 8);
src += 8;
dst += seq->frame.linesize[0];
}

return src;
}

static unsigned char *seq_decode_op3(SeqVideoContext *seq, unsigned char *src, unsigned char *dst)
{
int pos, offset;

do {
pos = *src++;
offset = ((pos >> 3) & 7) * seq->frame.linesize[0] + (pos & 7);
dst[offset] = *src++;
} while (!(pos & 0x80));

return src;
}

static void seqvideo_decode(SeqVideoContext *seq, unsigned char *data, int data_size)
{
GetBitContext gb;
int flags, i, j, x, y, op;
unsigned char c[3];
unsigned char *dst;

flags = *data++;

if (flags & 1) {
for (i = 0; i < 256; i++) {
for (j = 0; j < 3; j++, data++)
c[j] = (*data << 2) | (*data >> 4);
seq->palette[i] = (c[0] << 16) | (c[1] << 8) | c[2];
}
memcpy(seq->frame.data[1], seq->palette, sizeof(seq->palette));
seq->frame.palette_has_changed = 1;
}

if (flags & 2) {
init_get_bits(&gb, data, 128 * 8); data += 128;
for (y = 0; y < 128; y += 8)
for (x = 0; x < 256; x += 8) {
dst = &seq->frame.data[0][y * seq->frame.linesize[0] + x];
op = get_bits(&gb, 2);
switch (op) {
case 1:
data = seq_decode_op1(seq, data, dst);
break;
case 2:
data = seq_decode_op2(seq, data, dst);
break;
case 3:
data = seq_decode_op3(seq, data, dst);
break;
}
}
}
}

static int seqvideo_decode_init(AVCodecContext *avctx)
{
SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;

seq->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
avctx->has_b_frames = 0;

seq->frame.data[0] = NULL;

return 0;
}

static int seqvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
uint8_t *buf, int buf_size)
{

SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;

seq->frame.reference = 1;
seq->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &seq->frame)) {
av_log(seq->avctx, AV_LOG_ERROR, "tiertexseqvideo: reget_buffer() failed\n");
return -1;
}

seqvideo_decode(seq, buf, buf_size);

*data_size = sizeof(AVFrame);
*(AVFrame *)data = seq->frame;

return buf_size;
}

static int seqvideo_decode_end(AVCodecContext *avctx)
{
SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;

if (seq->frame.data[0])
avctx->release_buffer(avctx, &seq->frame);

return 0;
}

AVCodec tiertexseqvideo_decoder = {
"tiertexseqvideo",
CODEC_TYPE_VIDEO,
CODEC_ID_TIERTEXSEQVIDEO,
sizeof(SeqVideoContext),
seqvideo_decode_init,
NULL,
seqvideo_decode_end,
seqvideo_decode_frame,
CODEC_CAP_DR1,
};
1 change: 1 addition & 0 deletions libavformat/Makefile
Expand Up @@ -130,6 +130,7 @@ OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
OBJS-$(CONFIG_WV_DEMUXER) += wv.o
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o

# image formats
OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
Expand Down
3 changes: 3 additions & 0 deletions libavformat/allformats.c
Expand Up @@ -478,6 +478,9 @@ void av_register_all(void)
#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
av_register_input_format(&yuv4mpegpipe_demuxer);
#endif
#ifdef CONFIG_TIERTEXSEQ_DEMUXER
av_register_input_format(&tiertexseq_demuxer);
#endif

/* image formats */
#if 0
Expand Down
1 change: 1 addition & 0 deletions libavformat/allformats.h
Expand Up @@ -162,6 +162,7 @@ extern AVInputFormat wsvqa_demuxer;
extern AVInputFormat wv_demuxer;
extern AVOutputFormat yuv4mpegpipe_muxer;
extern AVInputFormat yuv4mpegpipe_demuxer;
extern AVInputFormat tiertexseq_demuxer;

/* raw.c */
int pcm_read_seek(AVFormatContext *s,
Expand Down
4 changes: 2 additions & 2 deletions libavformat/avformat.h
Expand Up @@ -25,8 +25,8 @@
extern "C" {
#endif

#define LIBAVFORMAT_VERSION_INT ((50<<16)+(5<<8)+0)
#define LIBAVFORMAT_VERSION 50.5.0
#define LIBAVFORMAT_VERSION_INT ((50<<16)+(6<<8)+0)
#define LIBAVFORMAT_VERSION 50.6.0
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT

#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
Expand Down

0 comments on commit 5ea7965

Please sign in to comment.