X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvp6.c;h=4f3f402c70f27a61dc23433703b08efe6e821e93;hb=b239526873dc81f9b66796ad4d9fe1cb93ec34d3;hp=ffd95f0cad833d1e9012a42826f772e69b9f7ed7;hpb=91fc2cf150cdee0493e51dfe44df0ab88ff2f31b;p=ffmpeg diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index ffd95f0cad8..4f3f402c70f 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -1,5 +1,5 @@ /** - * @file vp6.c + * @file * VP6 compatible video decoder * * Copyright (C) 2006 Aurelien Jacobs @@ -8,20 +8,20 @@ * - upper 4bits: difference between encoded width and visible width * - lower 4bits: difference between encoded height and visible height * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -29,18 +29,22 @@ #include "avcodec.h" #include "dsputil.h" -#include "bitstream.h" -#include "mpegvideo.h" +#include "get_bits.h" +#include "huffman.h" #include "vp56.h" #include "vp56data.h" #include "vp6data.h" +#define VP6_MAX_HUFF_SIZE 12 -static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, +static void vp6_parse_coeff(VP56Context *s); +static void vp6_parse_coeff_huffman(VP56Context *s); + +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; @@ -50,7 +54,7 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, int separated_coeff = buf[0] & 1; s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80); - vp56_init_dequant(s, (buf[0] >> 1) & 0x3F); + ff_vp56_init_dequant(s, (buf[0] >> 1) & 0x3F); if (s->framep[VP56_FRAME_CURRENT]->key_frame) { sub_version = buf[1] >> 3; @@ -72,7 +76,8 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, /* buf[4] is number of displayed macroblock rows */ /* buf[5] is number of displayed macroblock cols */ - 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); if (s->avctx->extradata_size == 1) { @@ -82,7 +87,7 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, res = 2; } - vp56_init_range_decoder(c, buf+6, buf_size-6); + ff_vp56_init_range_decoder(c, buf+6, buf_size-6); vp56_rac_gets(c, 2); parse_filter_info = s->filter_header; @@ -98,7 +103,7 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, buf += 2; buf_size -= 2; } - vp56_init_range_decoder(c, buf+1, buf_size-1); + ff_vp56_init_range_decoder(c, buf+1, buf_size-1); *golden_frame = vp56_rac_get(c); if (s->filter_header) { @@ -126,14 +131,21 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, s->filter_selection = 16; } - if (vp56_rac_get(c)) - av_log(s->avctx, AV_LOG_WARNING, - "alternative entropy decoding not supported\n"); + s->use_huffman = vp56_rac_get(c); + s->parse_coeff = vp6_parse_coeff; if (coeff_offset) { - vp56_init_range_decoder(&s->cc, buf+coeff_offset, - buf_size-coeff_offset); - s->ccp = &s->cc; + buf += coeff_offset; + buf_size -= coeff_offset; + if (buf_size < 0) + return 0; + if (s->use_huffman) { + s->parse_coeff = vp6_parse_coeff_huffman; + init_get_bits(&s->gb, buf, buf_size<<3); + } else { + ff_vp56_init_range_decoder(&s->cc, buf, buf_size); + s->ccp = &s->cc; + } } else { s->ccp = &s->c; } @@ -141,7 +153,7 @@ static int vp6_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, 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; @@ -152,9 +164,9 @@ static void vp6_coeff_order_table_init(vp56_context_t *s) 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; @@ -170,10 +182,10 @@ static void vp6_default_models_init(vp56_context_t *s) 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++) { @@ -194,10 +206,38 @@ static void vp6_parse_vector_models(vp56_context_t *s) model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7); } -static void vp6_parse_coeff_models(vp56_context_t *s) +/* nodes must ascend by count, but with descending symbol order */ +static int vp6_huff_cmp(const void *va, const void *vb) { - vp56_range_coder_t *c = &s->c; - vp56_model_t *model = s->modelp; + const Node *a = va, *b = vb; + return (a->count - b->count)*16 + (b->sym - a->sym); +} + +static void vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[], + const uint8_t *map, unsigned size, VLC *vlc) +{ + Node nodes[2*VP6_MAX_HUFF_SIZE], *tmp = &nodes[size]; + int a, b, i; + + /* first compute probabilities from model */ + tmp[0].count = 256; + for (i=0; i> 8; + b = tmp[i].count * (255 - coeff_model[i]) >> 8; + nodes[map[2*i ]].count = a + !a; + nodes[map[2*i+1]].count = b + !b; + } + + free_vlc(vlc); + /* then build the huffman tree accodring to probabilities */ + ff_huff_build_tree(s->avctx, vlc, size, nodes, vp6_huff_cmp, + FF_HUFFMAN_FLAG_HNODE_FIRST); +} + +static void vp6_parse_coeff_models(VP56Context *s) +{ + VP56RangeCoder *c = &s->c; + VP56Model *model = s->modelp; int def_prob[11]; int node, cg, ctx, pos; int ct; /* code type */ @@ -237,20 +277,35 @@ static void vp6_parse_coeff_models(vp56_context_t *s) model->coeff_ract[pt][ct][cg][node] = def_prob[node]; } + if (s->use_huffman) { + for (pt=0; pt<2; pt++) { + vp6_build_huff_tree(s, model->coeff_dccv[pt], + vp6_huff_coeff_map, 12, &s->dccv_vlc[pt]); + vp6_build_huff_tree(s, model->coeff_runv[pt], + vp6_huff_run_map, 9, &s->runv_vlc[pt]); + for (ct=0; ct<3; ct++) + for (cg = 0; cg < 6; cg++) + vp6_build_huff_tree(s, model->coeff_ract[pt][ct][cg], + vp6_huff_coeff_map, 12, + &s->ract_vlc[pt][ct][cg]); + } + memset(s->nb_null, 0, sizeof(s->nb_null)); + } else { /* coeff_dcct is a linear combination of coeff_dccv */ for (pt=0; pt<2; pt++) for (ctx=0; ctx<3; ctx++) for (node=0; node<5; node++) model->coeff_dcct[pt][ctx][node] = av_clip(((model->coeff_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255); + } } -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]; @@ -282,10 +337,83 @@ static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) } } -static void vp6_parse_coeff(vp56_context_t *s) +/** + * Read number of consecutive blocks with null DC or AC. + * This value is < 74. + */ +static unsigned vp6_get_nb_null(VP56Context *s) +{ + unsigned val = get_bits(&s->gb, 2); + if (val == 2) + val += get_bits(&s->gb, 2); + else if (val == 3) { + val = get_bits1(&s->gb) << 2; + val = 6+val + get_bits(&s->gb, 2+val); + } + return val; +} + +static void vp6_parse_coeff_huffman(VP56Context *s) +{ + VP56Model *model = s->modelp; + uint8_t *permute = s->scantable.permutated; + VLC *vlc_coeff; + int coeff, sign, coeff_idx; + int b, cg, idx; + int pt = 0; /* plane type (0 for Y, 1 for U or V) */ + + for (b=0; b<6; b++) { + int ct = 0; /* code type */ + if (b > 3) pt = 1; + vlc_coeff = &s->dccv_vlc[pt]; + + for (coeff_idx=0; coeff_idx<64; ) { + int run = 1; + if (coeff_idx<2 && s->nb_null[coeff_idx][pt]) { + s->nb_null[coeff_idx][pt]--; + if (coeff_idx) + break; + } else { + if (get_bits_count(&s->gb) >= s->gb.size_in_bits) + return; + coeff = get_vlc2(&s->gb, vlc_coeff->table, 9, 3); + if (coeff == 0) { + if (coeff_idx) { + int pt = (coeff_idx >= 6); + run += get_vlc2(&s->gb, s->runv_vlc[pt].table, 9, 3); + if (run >= 9) + run += get_bits(&s->gb, 6); + } else + s->nb_null[0][pt] = vp6_get_nb_null(s); + ct = 0; + } else if (coeff == 11) { /* end of block */ + if (coeff_idx == 1) /* first AC coeff ? */ + s->nb_null[1][pt] = vp6_get_nb_null(s); + break; + } else { + int coeff2 = vp56_coeff_bias[coeff]; + if (coeff > 4) + coeff2 += get_bits(&s->gb, coeff <= 9 ? coeff - 4 : 11); + ct = 1 + (coeff2 > 1); + sign = get_bits1(&s->gb); + coeff2 = (coeff2 ^ -sign) + sign; + if (coeff_idx) + coeff2 *= s->dequant_ac; + idx = model->coeff_index_to_pos[coeff_idx]; + s->block_coeff[b][permute[idx]] = coeff2; + } + } + coeff_idx+=run; + cg = FFMIN(vp6_coeff_groups[coeff_idx], 3); + vlc_coeff = &s->ract_vlc[pt][ct][cg]; + } + } +} + +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; @@ -309,7 +437,7 @@ static void vp6_parse_coeff(vp56_context_t *s) if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[3])) { idx = vp56_rac_get_tree(c, vp56_pc_tree, model1); - coeff = vp56_coeff_bias[idx]; + coeff = vp56_coeff_bias[idx+5]; for (i=vp56_coeff_bit_length[idx]; i>=0; i--) coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i; } else { @@ -354,19 +482,6 @@ static void vp6_parse_coeff(vp56_context_t *s) } } -static int vp6_adjust(int v, int t) -{ - int V = v, s = v >> 31; - V ^= s; - V -= s; - if (V-t-1 >= (unsigned)(t-1)) - return v; - V = 2*t - V; - V += s; - V ^= s; - return V; -} - static int vp6_block_variance(uint8_t *src, int stride) { int sum = 0, square_sum = 0; @@ -399,7 +514,7 @@ static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride, } } -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; @@ -407,42 +522,9 @@ static void vp6_filter_diag2(vp56_context_t *s, uint8_t *dst, uint8_t *src, s->dsp.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight); } -static void vp6_filter_diag4(uint8_t *dst, uint8_t *src, int stride, - const int16_t *h_weights,const int16_t *v_weights) -{ - int x, y; - int tmp[8*11]; - int *t = tmp; - - src -= stride; - - for (y=0; y<11; y++) { - for (x=0; x<8; x++) { - t[x] = av_clip_uint8(( src[x-1] * h_weights[0] - + src[x ] * h_weights[1] - + src[x+1] * h_weights[2] - + src[x+2] * h_weights[3] + 64) >> 7); - } - src += stride; - t += 8; - } - - t = tmp + 8; - for (y=0; y<8; y++) { - for (x=0; x<8; x++) { - dst[x] = av_clip_uint8(( t[x-8 ] * v_weights[0] - + t[x ] * v_weights[1] - + t[x+8 ] * v_weights[2] - + t[x+16] * v_weights[3] + 64) >> 7); - } - dst += stride; - t += 8; - } -} - -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; @@ -477,7 +559,7 @@ static void vp6_filter(vp56_context_t *s, uint8_t *dst, uint8_t *src, vp6_filter_hv4(dst, src+offset1, stride, stride, vp6_block_copy_filter[select][y8]); } else { - vp6_filter_diag4(dst, src+offset1 + ((mv.x^mv.y)>>31), stride, + s->vp56dsp.vp6_filter_diag4(dst, src+offset1+((mv.x^mv.y)>>31), stride, vp6_block_copy_filter[select][x8], vp6_block_copy_filter[select][y8]); } @@ -490,17 +572,15 @@ static void vp6_filter(vp56_context_t *s, uint8_t *dst, uint8_t *src, } } -static int vp6_decode_init(AVCodecContext *avctx) +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); + ff_vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, + avctx->codec->id == CODEC_ID_VP6A); s->vp56_coord_div = vp6_coord_div; s->parse_vector_adjustment = vp6_parse_vector_adjustment; - s->adjust = vp6_adjust; s->filter = vp6_filter; - s->parse_coeff = vp6_parse_coeff; s->default_models_init = vp6_default_models_init; s->parse_vector_models = vp6_parse_vector_models; s->parse_coeff_models = vp6_parse_coeff_models; @@ -509,40 +589,60 @@ static int vp6_decode_init(AVCodecContext *avctx) return 0; } -AVCodec vp6_decoder = { +static av_cold int vp6_decode_free(AVCodecContext *avctx) +{ + VP56Context *s = avctx->priv_data; + int pt, ct, cg; + + ff_vp56_free(avctx); + + for (pt=0; pt<2; pt++) { + free_vlc(&s->dccv_vlc[pt]); + free_vlc(&s->runv_vlc[pt]); + for (ct=0; ct<3; ct++) + for (cg=0; cg<6; cg++) + free_vlc(&s->ract_vlc[pt][ct][cg]); + } + return 0; +} + +AVCodec ff_vp6_decoder = { "vp6", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP6, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, - vp56_free, - vp56_decode_frame, + vp6_decode_free, + ff_vp56_decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), }; /* flash version, not flipped upside-down */ -AVCodec vp6f_decoder = { +AVCodec ff_vp6f_decoder = { "vp6f", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP6F, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, - vp56_free, - vp56_decode_frame, + vp6_decode_free, + ff_vp56_decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), }; /* flash version, not flipped upside-down, with alpha channel */ -AVCodec vp6a_decoder = { +AVCodec ff_vp6a_decoder = { "vp6a", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP6A, - sizeof(vp56_context_t), + sizeof(VP56Context), vp6_decode_init, NULL, - vp56_free, - vp56_decode_frame, + vp6_decode_free, + ff_vp56_decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), };