#include "avcodec.h"
#include "bytestream.h"
+#include "decode.h"
#include "internal.h"
#include "libavutil/common.h"
typedef struct KmvcContext {
AVCodecContext *avctx;
+ GetByteContext g;
+ uint8_t *cur, *prev;
int setpal;
int palsize;
uint32_t pal[MAX_PALSIZE];
- uint8_t *cur, *prev;
uint8_t frm0[320 * 200], frm1[320 * 200];
- GetByteContext g;
} KmvcContext;
typedef struct BitBuf {
int i, ret;
int header;
int blocksize;
- int pal_size;
- const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size);
bytestream2_init(&ctx->g, avpkt->data, avpkt->size);
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
+ frame->palette_has_changed = ff_copy_palette(ctx->pal, avpkt, avctx);
+
header = bytestream2_get_byte(&ctx->g);
/* blocksize 127 is really palette change event */
}
}
- if (pal && pal_size == AVPALETTE_SIZE) {
- frame->palette_has_changed = 1;
- memcpy(ctx->pal, pal, AVPALETTE_SIZE);
- } else if (pal) {
- av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size);
- }
-
if (ctx->setpal) {
ctx->setpal = 0;
frame->palette_has_changed = 1;
}
/* flip buffers */
- if (ctx->cur == ctx->frm0) {
- ctx->cur = ctx->frm1;
- ctx->prev = ctx->frm0;
- } else {
- ctx->cur = ctx->frm0;
- ctx->prev = ctx->frm1;
- }
+ FFSWAP(uint8_t *, ctx->cur, ctx->prev);
*got_frame = 1;
return 0;
}
-AVCodec ff_kmvc_decoder = {
+const AVCodec ff_kmvc_decoder = {
.name = "kmvc",
.long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
.type = AVMEDIA_TYPE_VIDEO,