*/
/**
- * @file tiertexseqv.c
+ * @file
* Tiertex Limited SEQ video decoder
*/
#include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
typedef struct SeqVideoContext {
AVCodecContext *avctx;
AVFrame frame;
- unsigned int palette[256];
- unsigned char block[8 * 8];
} SeqVideoContext;
const unsigned char *color_table;
int b, i, len, bits;
GetBitContext gb;
+ unsigned char block[8 * 8];
len = *src++;
if (len & 0x80) {
switch (len & 3) {
case 1:
- src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block));
+ src = seq_unpack_rle_block(src, block, sizeof(block));
for (b = 0; b < 8; b++) {
- memcpy(dst, &seq->block[b * 8], 8);
+ memcpy(dst, &block[b * 8], 8);
dst += seq->frame.linesize[0];
}
break;
case 2:
- src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block));
+ src = seq_unpack_rle_block(src, block, sizeof(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[b * seq->frame.linesize[0]] = block[i * 8 + b];
++dst;
}
break;
int flags, i, j, x, y, op;
unsigned char c[3];
unsigned char *dst;
+ uint32_t *palette;
flags = *data++;
if (flags & 1) {
+ palette = (uint32_t *)seq->frame.data[1];
for (i = 0; i < 256; i++) {
for (j = 0; j < 3; j++, data++)
c[j] = (*data << 2) | (*data >> 4);
- seq->palette[i] = AV_RB24(c);
+ palette[i] = AV_RB24(c);
}
- memcpy(seq->frame.data[1], seq->palette, sizeof(seq->palette));
seq->frame.palette_has_changed = 1;
}
static int seqvideo_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;
SeqVideoContext *seq = avctx->priv_data;
AVCodec tiertexseqvideo_decoder = {
"tiertexseqvideo",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_TIERTEXSEQVIDEO,
sizeof(SeqVideoContext),
seqvideo_decode_init,