X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvp56.h;h=f71b9a8344ecbcee571acae472d59a45a927ac15;hb=01f6df01b6fdc2d71b82370374cde4bf102928c7;hp=50e20155044b3f3c56ddd15c4e95bfe1140d81e5;hpb=dd9b86354c4ab002f7a3509d71461a84e21d1be9;p=ffmpeg diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 50e20155044..f71b9a8344e 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -1,88 +1,143 @@ -/** - * @file vp56.h - * VP5 and VP6 compatible video decoder (common features) - * +/* * Copyright (C) 2006 Aurelien Jacobs * - * 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 - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP56_H -#define VP56_H +/** + * @file + * VP5 and VP6 compatible video decoder (common features) + */ + +#ifndef AVCODEC_VP56_H +#define AVCODEC_VP56_H -#include "vp56data.h" #include "dsputil.h" -#include "mpegvideo.h" - - -typedef struct vp56_context vp56_context_t; -typedef struct vp56_mv vp56_mv_t; - -typedef void (*vp56_parse_vector_adjustment_t)(vp56_context_t *s, - vp56_mv_t *vect); -typedef int (*vp56_adjust_t)(int v, int t); -typedef void (*vp56_filter_t)(vp56_context_t *s, uint8_t *dst, uint8_t *src, - int offset1, int offset2, int stride, - vp56_mv_t mv, int mask, int select, int luma); -typedef void (*vp56_parse_coeff_t)(vp56_context_t *s); -typedef void (*vp56_default_models_init_t)(vp56_context_t *s); -typedef void (*vp56_parse_vector_models_t)(vp56_context_t *s); -typedef void (*vp56_parse_coeff_models_t)(vp56_context_t *s); -typedef int (*vp56_parse_header_t)(vp56_context_t *s, uint8_t *buf, - int buf_size, int *golden_frame); - -typedef struct { +#include "get_bits.h" +#include "hpeldsp.h" +#include "bytestream.h" +#include "h264chroma.h" +#include "videodsp.h" +#include "vp3dsp.h" +#include "vp56dsp.h" + +typedef struct vp56_context VP56Context; + +typedef enum { + VP56_FRAME_NONE =-1, + VP56_FRAME_CURRENT = 0, + VP56_FRAME_PREVIOUS = 1, + VP56_FRAME_GOLDEN = 2, + VP56_FRAME_GOLDEN2 = 3, +} VP56Frame; + +typedef enum { + VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */ + VP56_MB_INTRA = 1, /**< Intra MB */ + VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */ + VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */ + VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */ + VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */ + VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */ + VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */ + VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */ + VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */ +} VP56mb; + +typedef struct VP56Tree { + int8_t val; + int8_t prob_idx; +} VP56Tree; + +typedef struct VP56mv { + DECLARE_ALIGNED(4, int16_t, x); + int16_t y; +} VP56mv; + +#define VP56_SIZE_CHANGE 1 + +typedef void (*VP56ParseVectorAdjustment)(VP56Context *s, + VP56mv *vect); +typedef void (*VP56Filter)(VP56Context *s, uint8_t *dst, uint8_t *src, + int offset1, int offset2, int stride, + VP56mv mv, int mask, int select, int luma); +typedef void (*VP56ParseCoeff)(VP56Context *s); +typedef void (*VP56DefaultModelsInit)(VP56Context *s); +typedef void (*VP56ParseVectorModels)(VP56Context *s); +typedef int (*VP56ParseCoeffModels)(VP56Context *s); +typedef int (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf, + int buf_size, int *golden_frame); + +typedef struct VP56RangeCoder { int high; - int bits; + int bits; /* stored negated (i.e. negative "bits" is a positive number of + bits left) in order to eliminate a negate in cache refilling */ const uint8_t *buffer; - unsigned long code_word; -} vp56_range_coder_t; + const uint8_t *end; + unsigned int code_word; +} VP56RangeCoder; -typedef struct { +typedef struct VP56RefDc { uint8_t not_null_dc; - vp56_frame_t ref_frame; - DCTELEM dc_coeff; -} vp56_ref_dc_t; - -struct vp56_mv { - int x; - int y; -}; + VP56Frame ref_frame; + int16_t dc_coeff; +} VP56RefDc; -typedef struct { +typedef struct VP56Macroblock { uint8_t type; - vp56_mv_t mv; -} vp56_macroblock_t; + VP56mv mv; +} VP56Macroblock; + +typedef struct VP56Model { + uint8_t coeff_reorder[64]; /* used in vp6 only */ + uint8_t coeff_index_to_pos[64]; /* used in vp6 only */ + uint8_t vector_sig[2]; /* delta sign */ + uint8_t vector_dct[2]; /* delta coding types */ + uint8_t vector_pdi[2][2]; /* predefined delta init */ + uint8_t vector_pdv[2][7]; /* predefined delta values */ + uint8_t vector_fdv[2][8]; /* 8 bit delta value definition */ + uint8_t coeff_dccv[2][11]; /* DC coeff value */ + uint8_t coeff_ract[2][3][6][11]; /* Run/AC coding type and AC coeff value */ + uint8_t coeff_acct[2][3][3][6][5];/* vp5 only AC coding type for coding group < 3 */ + uint8_t coeff_dcct[2][36][5]; /* DC coeff coding type */ + uint8_t coeff_runv[2][14]; /* run value (vp6 only) */ + uint8_t mb_type[3][10][10]; /* model for decoding MB type */ + uint8_t mb_types_stats[3][10][2];/* contextual, next MB type stats */ +} VP56Model; struct vp56_context { AVCodecContext *avctx; - DSPContext dsp; - ScanTable scantable; - AVFrame frames[3]; + H264ChromaContext h264chroma; + HpelDSPContext hdsp; + VideoDSPContext vdsp; + VP3DSPContext vp3dsp; + VP56DSPContext vp56dsp; + uint8_t idct_scantable[64]; + AVFrame *frames[4]; uint8_t *edge_emu_buffer_alloc; uint8_t *edge_emu_buffer; - vp56_range_coder_t c; - vp56_range_coder_t cc; - vp56_range_coder_t *ccp; + VP56RangeCoder c; + VP56RangeCoder cc; + VP56RangeCoder *ccp; int sub_version; /* frame info */ - int plane_width[3]; - int plane_height[3]; + int plane_width[4]; + int plane_height[4]; int mb_width; /* number of horizontal MB */ int mb_height; /* number of vertical MB */ int block_offset[6]; @@ -92,21 +147,19 @@ struct vp56_context { uint16_t dequant_ac; /* DC predictors management */ - vp56_ref_dc_t *above_blocks; - vp56_ref_dc_t left_block[4]; + VP56RefDc *above_blocks; + VP56RefDc left_block[4]; int above_block_idx[6]; - DCTELEM prev_dc[3][3]; /* [plan][ref_frame] */ + int16_t prev_dc[3][3]; /* [plan][ref_frame] */ /* blocks / macroblock */ - vp56_mb_t mb_type; - vp56_macroblock_t *macroblocks; - DECLARE_ALIGNED_16(DCTELEM, block_coeff[6][64]); - uint8_t coeff_reorder[64]; /* used in vp6 only */ - uint8_t coeff_index_to_pos[64]; /* used in vp6 only */ + VP56mb mb_type; + VP56Macroblock *macroblocks; + DECLARE_ALIGNED(16, int16_t, block_coeff)[6][64]; /* motion vectors */ - vp56_mv_t mv[6]; /* vectors for each block in MB */ - vp56_mv_t vector_candidate[2]; + VP56mv mv[6]; /* vectors for each block in MB */ + VP56mv vector_candidate[2]; int vector_candidate_pos; /* filtering hints */ @@ -117,109 +170,137 @@ struct vp56_context { int max_vector_length; int sample_variance_threshold; - /* AC models */ - uint8_t vector_model_sig[2]; /* delta sign */ - uint8_t vector_model_dct[2]; /* delta coding types */ - uint8_t vector_model_pdi[2][2]; /* predefined delta init */ - uint8_t vector_model_pdv[2][7]; /* predefined delta values */ - uint8_t vector_model_fdv[2][8]; /* 8 bit delta value definition */ - uint8_t mb_type_model[3][10][10]; /* model for decoding MB type */ - uint8_t coeff_model_dccv[2][11]; /* DC coeff value */ - uint8_t coeff_model_ract[2][3][6][11]; /* Run/AC coding type and AC coeff value */ - uint8_t coeff_model_acct[2][3][3][6][5];/* vp5 only AC coding type for coding group < 3 */ - uint8_t coeff_model_dcct[2][36][5]; /* DC coeff coding type */ - uint8_t coeff_model_runv[2][14]; /* run value (vp6 only) */ - uint8_t mb_types_stats[3][10][2]; /* contextual, next MB type stats */ uint8_t coeff_ctx[4][64]; /* used in vp5 only */ uint8_t coeff_ctx_last[4]; /* used in vp5 only */ + int has_alpha; + /* upside-down flipping hints */ int flip; /* are we flipping ? */ int frbi; /* first row block index in MB */ int srbi; /* second row block index in MB */ - int stride[3]; /* stride for each plan */ + int stride[4]; /* stride for each plan */ const uint8_t *vp56_coord_div; - vp56_parse_vector_adjustment_t parse_vector_adjustment; - vp56_adjust_t adjust; - vp56_filter_t filter; - vp56_parse_coeff_t parse_coeff; - vp56_default_models_init_t default_models_init; - vp56_parse_vector_models_t parse_vector_models; - vp56_parse_coeff_models_t parse_coeff_models; - vp56_parse_header_t parse_header; + VP56ParseVectorAdjustment parse_vector_adjustment; + VP56Filter filter; + VP56ParseCoeff parse_coeff; + VP56DefaultModelsInit default_models_init; + VP56ParseVectorModels parse_vector_models; + VP56ParseCoeffModels parse_coeff_models; + VP56ParseHeader parse_header; + + VP56Model *modelp; + VP56Model models[2]; + + /* huffman decoding */ + int use_huffman; + GetBitContext gb; + VLC dccv_vlc[2]; + VLC runv_vlc[2]; + VLC ract_vlc[2][3][6]; + unsigned int nb_null[2][2]; /* number of consecutive NULL DC/AC */ }; -void vp56_init(vp56_context_t *s, AVCodecContext *avctx, int flip); -int vp56_free(AVCodecContext *avctx); -void vp56_init_dequant(vp56_context_t *s, int quantizer); -int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size); +int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha); +int ff_vp56_free(AVCodecContext *avctx); +void ff_vp56_init_dequant(VP56Context *s, int quantizer); +int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt); /** * vp56 specific range coder implementation */ -static inline void vp56_init_range_decoder(vp56_range_coder_t *c, - const uint8_t *buf, int buf_size) +extern const uint8_t ff_vp56_norm_shift[256]; +void ff_vp56_init_range_decoder(VP56RangeCoder *c, const uint8_t *buf, int buf_size); + +static av_always_inline unsigned int vp56_rac_renorm(VP56RangeCoder *c) { - c->high = 255; - c->bits = 8; - c->buffer = buf; - c->code_word = *c->buffer++ << 8; - c->code_word |= *c->buffer++; + int shift = ff_vp56_norm_shift[c->high]; + int bits = c->bits; + unsigned int code_word = c->code_word; + + c->high <<= shift; + code_word <<= shift; + bits += shift; + if(bits >= 0 && c->buffer < c->end) { + code_word |= bytestream_get_be16(&c->buffer) << bits; + bits -= 16; + } + c->bits = bits; + return code_word; } -static inline int vp56_rac_get_prob(vp56_range_coder_t *c, uint8_t prob) +#if ARCH_ARM +#include "arm/vp56_arith.h" +#elif ARCH_X86 +#include "x86/vp56_arith.h" +#endif + +#ifndef vp56_rac_get_prob +#define vp56_rac_get_prob vp56_rac_get_prob +static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob) { - unsigned int low = 1 + (((c->high - 1) * prob) / 256); - unsigned int low_shift = low << 8; - int bit = c->code_word >= low_shift; + unsigned int code_word = vp56_rac_renorm(c); + unsigned int low = 1 + (((c->high - 1) * prob) >> 8); + unsigned int low_shift = low << 16; + int bit = code_word >= low_shift; - if (bit) { - c->high -= low; - c->code_word -= low_shift; - } else { - c->high = low; - } + c->high = bit ? c->high - low : low; + c->code_word = bit ? code_word - low_shift : code_word; - /* normalize */ - while (c->high < 128) { - c->high <<= 1; - c->code_word <<= 1; - if (--c->bits == 0) { - c->bits = 8; - c->code_word |= *c->buffer++; - } - } return bit; } +#endif -static inline int vp56_rac_get(vp56_range_coder_t *c) +#ifndef vp56_rac_get_prob_branchy +// branchy variant, to be used where there's a branch based on the bit decoded +static av_always_inline int vp56_rac_get_prob_branchy(VP56RangeCoder *c, int prob) { + unsigned long code_word = vp56_rac_renorm(c); + unsigned low = 1 + (((c->high - 1) * prob) >> 8); + unsigned low_shift = low << 16; + + if (code_word >= low_shift) { + c->high -= low; + c->code_word = code_word - low_shift; + return 1; + } + + c->high = low; + c->code_word = code_word; + return 0; +} +#endif + +static av_always_inline int vp56_rac_get(VP56RangeCoder *c) +{ + unsigned int code_word = vp56_rac_renorm(c); /* equiprobable */ int low = (c->high + 1) >> 1; - unsigned int low_shift = low << 8; - int bit = c->code_word >= low_shift; + unsigned int low_shift = low << 16; + int bit = code_word >= low_shift; if (bit) { - c->high = (c->high - low) << 1; - c->code_word -= low_shift; + c->high -= low; + code_word -= low_shift; } else { - c->high = low << 1; + c->high = low; } - /* normalize */ - c->code_word <<= 1; - if (--c->bits == 0) { - c->bits = 8; - c->code_word |= *c->buffer++; - } + c->code_word = code_word; return bit; } -static inline int vp56_rac_gets(vp56_range_coder_t *c, int bits) +// rounding is different than vp56_rac_get, is vp56_rac_get wrong? +static av_always_inline int vp8_rac_get(VP56RangeCoder *c) +{ + return vp56_rac_get_prob(c, 128); +} + +static av_unused int vp56_rac_gets(VP56RangeCoder *c, int bits) { int value = 0; @@ -230,15 +311,50 @@ static inline int vp56_rac_gets(vp56_range_coder_t *c, int bits) return value; } -static inline int vp56_rac_gets_nn(vp56_range_coder_t *c, int bits) +static av_unused int vp8_rac_get_uint(VP56RangeCoder *c, int bits) +{ + int value = 0; + + while (bits--) { + value = (value << 1) | vp8_rac_get(c); + } + + return value; +} + +// fixme: add 1 bit to all the calls to this? +static av_unused int vp8_rac_get_sint(VP56RangeCoder *c, int bits) +{ + int v; + + if (!vp8_rac_get(c)) + return 0; + + v = vp8_rac_get_uint(c, bits); + + if (vp8_rac_get(c)) + v = -v; + + return v; +} + +// P(7) +static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) { int v = vp56_rac_gets(c, 7) << 1; return v + !v; } -static inline int vp56_rac_get_tree(vp56_range_coder_t *c, - const vp56_tree_t *tree, - const uint8_t *probs) +static av_unused int vp8_rac_get_nn(VP56RangeCoder *c) +{ + int v = vp8_rac_get_uint(c, 7) << 1; + return v + !v; +} + +static av_always_inline +int vp56_rac_get_tree(VP56RangeCoder *c, + const VP56Tree *tree, + const uint8_t *probs) { while (tree->val > 0) { if (vp56_rac_get_prob(c, probs[tree->prob_idx])) @@ -249,4 +365,41 @@ static inline int vp56_rac_get_tree(vp56_range_coder_t *c, return -tree->val; } -#endif /* VP56_H */ +/** + * This is identical to vp8_rac_get_tree except for the possibility of starting + * on a node other than the root node, needed for coeff decode where this is + * used to save a bit after a 0 token (by disallowing EOB to immediately follow.) + */ +static av_always_inline +int vp8_rac_get_tree_with_offset(VP56RangeCoder *c, const int8_t (*tree)[2], + const uint8_t *probs, int i) +{ + do { + i = tree[i][vp56_rac_get_prob(c, probs[i])]; + } while (i > 0); + + return -i; +} + +// how probabilities are associated with decisions is different I think +// well, the new scheme fits in the old but this way has one fewer branches per decision +static av_always_inline +int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*tree)[2], + const uint8_t *probs) +{ + return vp8_rac_get_tree_with_offset(c, tree, probs, 0); +} + +// DCTextra +static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) +{ + int v = 0; + + do { + v = (v<<1) + vp56_rac_get_prob(c, *prob++); + } while (*prob); + + return v; +} + +#endif /* AVCODEC_VP56_H */