* Tiertex Limited SEQ video decoder
*/
-#include "avcodec.h"
#define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
+#include "bitstream.h"
#include "internal.h"
typedef struct SeqVideoContext {
AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
} SeqVideoContext;
unsigned char *dst, int dst_size)
{
int i, len, sz;
- GetBitContext gb;
+ BitstreamContext bc;
int code_table[64];
/* get the rle codes */
- init_get_bits(&gb, src, (src_end - src) * 8);
+ bitstream_init(&bc, src, (src_end - src) * 8);
for (i = 0, sz = 0; i < 64 && sz < dst_size; i++) {
- if (get_bits_left(&gb) < 4)
+ if (bitstream_bits_left(&bc) < 4)
return NULL;
- code_table[i] = get_sbits(&gb, 4);
+ code_table[i] = bitstream_read_signed(&bc, 4);
sz += FFABS(code_table[i]);
}
- src += (get_bits_count(&gb) + 7) / 8;
+ src += (bitstream_tell(&bc) + 7) / 8;
/* do the rle unpacking */
for (i = 0; i < 64 && dst_size > 0; i++) {
{
const unsigned char *color_table;
int b, i, len, bits;
- GetBitContext gb;
+ BitstreamContext bc;
unsigned char block[8 * 8];
if (src_end - src < 1)
src = seq_unpack_rle_block(src, src_end, block, sizeof(block));
for (b = 0; b < 8; b++) {
memcpy(dst, &block[b * 8], 8);
- dst += seq->frame.linesize[0];
+ dst += seq->frame->linesize[0];
}
break;
case 2:
src = seq_unpack_rle_block(src, src_end, block, sizeof(block));
for (i = 0; i < 8; i++) {
for (b = 0; b < 8; b++)
- dst[b * seq->frame.linesize[0]] = block[i * 8 + b];
+ dst[b * seq->frame->linesize[0]] = block[i * 8 + b];
++dst;
}
break;
return NULL;
color_table = src;
src += len;
- init_get_bits(&gb, src, bits * 8 * 8); src += bits * 8;
+ bitstream_init(&bc, 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];
+ dst[i] = color_table[bitstream_read(&bc, bits)];
+ dst += seq->frame->linesize[0];
}
}
for (i = 0; i < 8; i++) {
memcpy(dst, src, 8);
src += 8;
- dst += seq->frame.linesize[0];
+ dst += seq->frame->linesize[0];
}
return src;
if (src_end - src < 2)
return NULL;
pos = *src++;
- offset = ((pos >> 3) & 7) * seq->frame.linesize[0] + (pos & 7);
+ offset = ((pos >> 3) & 7) * seq->frame->linesize[0] + (pos & 7);
dst[offset] = *src++;
} while (!(pos & 0x80));
static int seqvideo_decode(SeqVideoContext *seq, const unsigned char *data, int data_size)
{
const unsigned char *data_end = data + data_size;
- GetBitContext gb;
+ BitstreamContext bc;
int flags, i, j, x, y, op;
unsigned char c[3];
unsigned char *dst;
flags = *data++;
if (flags & 1) {
- palette = (uint32_t *)seq->frame.data[1];
+ palette = (uint32_t *)seq->frame->data[1];
if (data_end - data < 256 * 3)
return AVERROR_INVALIDDATA;
for (i = 0; i < 256; i++) {
c[j] = (*data << 2) | (*data >> 4);
palette[i] = AV_RB24(c);
}
- seq->frame.palette_has_changed = 1;
+ seq->frame->palette_has_changed = 1;
}
if (flags & 2) {
if (data_end - data < 128)
return AVERROR_INVALIDDATA;
- init_get_bits(&gb, data, 128 * 8); data += 128;
+ bitstream_init(&bc, 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);
+ dst = &seq->frame->data[0][y * seq->frame->linesize[0] + x];
+ op = bitstream_read(&bc, 2);
switch (op) {
case 1:
data = seq_decode_op1(seq, data, data_end, dst);
seq->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_PAL8;
- seq->frame.data[0] = NULL;
+ seq->frame = av_frame_alloc();
+ if (!seq->frame)
+ return AVERROR(ENOMEM);
return 0;
}
SeqVideoContext *seq = avctx->priv_data;
- if ((ret = ff_reget_buffer(avctx, &seq->frame)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, seq->frame)) < 0) {
av_log(seq->avctx, AV_LOG_ERROR, "tiertexseqvideo: reget_buffer() failed\n");
return ret;
}
if (seqvideo_decode(seq, buf, buf_size))
return AVERROR_INVALIDDATA;
- if ((ret = av_frame_ref(data, &seq->frame)) < 0)
+ if ((ret = av_frame_ref(data, seq->frame)) < 0)
return ret;
*got_frame = 1;
{
SeqVideoContext *seq = avctx->priv_data;
- av_frame_unref(&seq->frame);
+ av_frame_free(&seq->frame);
return 0;
}
AVCodec ff_tiertexseqvideo_decoder = {
.name = "tiertexseqvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TIERTEXSEQVIDEO,
.priv_data_size = sizeof(SeqVideoContext),
.init = seqvideo_decode_init,
.close = seqvideo_decode_end,
.decode = seqvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
+ .capabilities = AV_CODEC_CAP_DR1,
};