/**
- * @file vp5.c
+ * @file libavcodec/vp5.c
* VP5 compatible video decoder
*
* Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
#include "avcodec.h"
#include "dsputil.h"
-#include "bitstream.h"
-#include "mpegvideo.h"
+#include "get_bits.h"
#include "vp56.h"
#include "vp56data.h"
#include "vp5data.h"
-static int vp5_parse_header(vp56_context_t *s, const uint8_t *buf, int buf_size,
+static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
int *golden_frame)
{
- vp56_range_coder_t *c = &s->c;
+ VP56RangeCoder *c = &s->c;
int rows, cols;
vp56_init_range_decoder(&s->c, buf, buf_size);
vp56_rac_gets(c, 8); /* number of displayed macroblock rows */
vp56_rac_gets(c, 8); /* number of displayed macroblock cols */
vp56_rac_gets(c, 2);
- if (16*cols != s->avctx->coded_width ||
+ if (!s->macroblocks || /* first frame */
+ 16*cols != s->avctx->coded_width ||
16*rows != s->avctx->coded_height) {
avcodec_set_dimensions(s->avctx, 16*cols, 16*rows);
return 2;
}
- }
+ } else if (!s->macroblocks)
+ return 0;
return 1;
}
return v;
}
-static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
+static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
{
- vp56_range_coder_t *c = &s->c;
- vp56_model_t *model = s->modelp;
+ VP56RangeCoder *c = &s->c;
+ VP56Model *model = s->modelp;
int comp, di;
for (comp=0; comp<2; comp++) {
}
}
-static void vp5_parse_vector_models(vp56_context_t *s)
+static void vp5_parse_vector_models(VP56Context *s)
{
- vp56_range_coder_t *c = &s->c;
- vp56_model_t *model = s->modelp;
+ VP56RangeCoder *c = &s->c;
+ VP56Model *model = s->modelp;
int comp, node;
for (comp=0; comp<2; comp++) {
model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7);
}
-static void vp5_parse_coeff_models(vp56_context_t *s)
+static void vp5_parse_coeff_models(VP56Context *s)
{
- vp56_range_coder_t *c = &s->c;
- vp56_model_t *model = s->modelp;
+ VP56RangeCoder *c = &s->c;
+ VP56Model *model = s->modelp;
uint8_t def_prob[11];
int node, cg, ctx;
int ct; /* code type */
model->coeff_acct[pt][ct][cg][ctx][node] = av_clip(((model->coeff_ract[pt][ct][cg][node] * vp5_ract_lc[ct][cg][node][ctx][0] + 128) >> 8) + vp5_ract_lc[ct][cg][node][ctx][1], 1, 254);
}
-static void vp5_parse_coeff(vp56_context_t *s)
+static void vp5_parse_coeff(VP56Context *s)
{
- vp56_range_coder_t *c = &s->c;
- vp56_model_t *model = s->modelp;
+ VP56RangeCoder *c = &s->c;
+ VP56Model *model = s->modelp;
uint8_t *permute = s->scantable.permutated;
uint8_t *model1, *model2;
int coeff, sign, coeff_idx;
}
}
-static void vp5_default_models_init(vp56_context_t *s)
+static void vp5_default_models_init(VP56Context *s)
{
- vp56_model_t *model = s->modelp;
+ VP56Model *model = s->modelp;
int i;
for (i=0; i<2; i++) {
memset(model->vector_pdv, 0x80, sizeof(model->vector_pdv));
}
-static int vp5_decode_init(AVCodecContext *avctx)
+static av_cold int vp5_decode_init(AVCodecContext *avctx)
{
- vp56_context_t *s = avctx->priv_data;
+ VP56Context *s = avctx->priv_data;
vp56_init(avctx, 1, 0);
s->vp56_coord_div = vp5_coord_div;
"vp5",
CODEC_TYPE_VIDEO,
CODEC_ID_VP5,
- sizeof(vp56_context_t),
+ sizeof(VP56Context),
vp5_decode_init,
NULL,
vp56_free,
vp56_decode_frame,
CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
};