Mercurial > libavcodec.hg
diff vp6.c @ 8299:524cb7f5ad2b libavcodec
avoid POSIX reserved _t suffix
author | aurel |
---|---|
date | Thu, 11 Dec 2008 22:56:19 +0000 |
parents | 21c3e313709e |
children | 3cddc18caeca |
line wrap: on
line diff
--- a/vp6.c Thu Dec 11 22:34:14 2008 +0000 +++ b/vp6.c Thu Dec 11 22:56:19 2008 +0000 @@ -37,13 +37,13 @@ #include "vp6data.h" -static void vp6_parse_coeff(vp56_context_t *s); -static void vp6_parse_coeff_huffman(vp56_context_t *s); +static void vp6_parse_coeff(VP56Context *s); +static void vp6_parse_coeff_huffman(VP56Context *s); -static int vp6_parse_header(vp56_context_t *s, const uint8_t *buf, int buf_size, +static int vp6_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 parse_filter_info = 0; int coeff_offset = 0; int vrt_shift = 0; @@ -151,7 +151,7 @@ return res; } -static void vp6_coeff_order_table_init(vp56_context_t *s) +static void vp6_coeff_order_table_init(VP56Context *s) { int i, pos, idx = 1; @@ -162,9 +162,9 @@ s->modelp->coeff_index_to_pos[idx++] = pos; } -static void vp6_default_models_init(vp56_context_t *s) +static void vp6_default_models_init(VP56Context *s) { - vp56_model_t *model = s->modelp; + Vp56Model *model = s->modelp; model->vector_dct[0] = 0xA2; model->vector_dct[1] = 0xA4; @@ -180,10 +180,10 @@ vp6_coeff_order_table_init(s); } -static void vp6_parse_vector_models(vp56_context_t *s) +static void vp6_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++) { @@ -211,7 +211,7 @@ return (a->count - b->count)*16 + (b->sym - a->sym); } -static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[], +static void vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[], const uint8_t *map, unsigned size, VLC *vlc) { Node nodes[2*size], *tmp = &nodes[size]; @@ -231,10 +231,10 @@ FF_HUFFMAN_FLAG_HNODE_FIRST); } -static void vp6_parse_coeff_models(vp56_context_t *s) +static void vp6_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; int def_prob[11]; int node, cg, ctx, pos; int ct; /* code type */ @@ -296,13 +296,13 @@ } } -static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) +static void vp6_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; - *vect = (vp56_mv_t) {0,0}; + *vect = (VP56mv) {0,0}; if (s->vector_candidate_pos < 2) *vect = s->vector_candidate[0]; @@ -338,7 +338,7 @@ * Read number of consecutive blocks with null DC or AC. * This value is < 74. */ -static unsigned vp6_get_nb_null(vp56_context_t *s) +static unsigned vp6_get_nb_null(VP56Context *s) { unsigned val = get_bits(&s->gb, 2); if (val == 2) @@ -350,9 +350,9 @@ return val; } -static void vp6_parse_coeff_huffman(vp56_context_t *s) +static void vp6_parse_coeff_huffman(VP56Context *s) { - vp56_model_t *model = s->modelp; + Vp56Model *model = s->modelp; uint8_t *permute = s->scantable.permutated; VLC *vlc_coeff; int coeff, sign, coeff_idx; @@ -405,10 +405,10 @@ } } -static void vp6_parse_coeff(vp56_context_t *s) +static void vp6_parse_coeff(VP56Context *s) { - vp56_range_coder_t *c = s->ccp; - vp56_model_t *model = s->modelp; + VP56RangeCoder *c = s->ccp; + Vp56Model *model = s->modelp; uint8_t *permute = s->scantable.permutated; uint8_t *model1, *model2, *model3; int coeff, sign, coeff_idx; @@ -522,7 +522,7 @@ } } -static void vp6_filter_diag2(vp56_context_t *s, uint8_t *dst, uint8_t *src, +static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src, int stride, int h_weight, int v_weight) { uint8_t *tmp = s->edge_emu_buffer+16; @@ -563,9 +563,9 @@ } } -static void vp6_filter(vp56_context_t *s, uint8_t *dst, uint8_t *src, +static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src, int offset1, int offset2, int stride, - vp56_mv_t mv, int mask, int select, int luma) + VP56mv mv, int mask, int select, int luma) { int filter4 = 0; int x8 = mv.x & mask; @@ -615,7 +615,7 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) { - vp56_context_t *s = avctx->priv_data; + VP56Context *s = avctx->priv_data; vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, avctx->codec->id == CODEC_ID_VP6A); @@ -635,7 +635,7 @@ "vp6", CODEC_TYPE_VIDEO, CODEC_ID_VP6, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, vp56_free, @@ -649,7 +649,7 @@ "vp6f", CODEC_TYPE_VIDEO, CODEC_ID_VP6F, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, vp56_free, @@ -663,7 +663,7 @@ "vp6a", CODEC_TYPE_VIDEO, CODEC_ID_VP6A, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, vp56_free,