mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
376 lines
10 KiB
C
376 lines
10 KiB
C
/*
|
|
* Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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,
|
|
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* VP5 and VP6 compatible video decoder (common features)
|
|
*/
|
|
|
|
#ifndef AVCODEC_VP56_H
|
|
#define AVCODEC_VP56_H
|
|
|
|
#include "vp56data.h"
|
|
#include "dsputil.h"
|
|
#include "get_bits.h"
|
|
#include "bytestream.h"
|
|
#include "h264chroma.h"
|
|
#include "videodsp.h"
|
|
#include "vp3dsp.h"
|
|
#include "vp56dsp.h"
|
|
|
|
typedef struct vp56_context VP56Context;
|
|
|
|
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);
|
|
|
|
typedef struct VP56RangeCoder {
|
|
int high;
|
|
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;
|
|
const uint8_t *end;
|
|
unsigned int code_word;
|
|
} VP56RangeCoder;
|
|
|
|
typedef struct VP56RefDc {
|
|
uint8_t not_null_dc;
|
|
VP56Frame ref_frame;
|
|
int16_t dc_coeff;
|
|
} VP56RefDc;
|
|
|
|
typedef struct VP56Macroblock {
|
|
uint8_t type;
|
|
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;
|
|
H264ChromaContext h264chroma;
|
|
VideoDSPContext vdsp;
|
|
VP3DSPContext vp3dsp;
|
|
VP56DSPContext vp56dsp;
|
|
ScanTable scantable;
|
|
AVFrame *frames[4];
|
|
uint8_t *edge_emu_buffer_alloc;
|
|
uint8_t *edge_emu_buffer;
|
|
VP56RangeCoder c;
|
|
VP56RangeCoder cc;
|
|
VP56RangeCoder *ccp;
|
|
int sub_version;
|
|
|
|
/* frame info */
|
|
int golden_frame;
|
|
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];
|
|
|
|
int quantizer;
|
|
uint16_t dequant_dc;
|
|
uint16_t dequant_ac;
|
|
|
|
/* DC predictors management */
|
|
VP56RefDc *above_blocks;
|
|
VP56RefDc left_block[4];
|
|
int above_block_idx[6];
|
|
int16_t prev_dc[3][3]; /* [plan][ref_frame] */
|
|
|
|
/* blocks / macroblock */
|
|
VP56mb mb_type;
|
|
VP56Macroblock *macroblocks;
|
|
DECLARE_ALIGNED(16, int16_t, block_coeff)[6][64];
|
|
|
|
/* motion vectors */
|
|
VP56mv mv[6]; /* vectors for each block in MB */
|
|
VP56mv vector_candidate[2];
|
|
int vector_candidate_pos;
|
|
|
|
/* filtering hints */
|
|
int filter_header; /* used in vp6 only */
|
|
int deblock_filtering;
|
|
int filter_selection;
|
|
int filter_mode;
|
|
int max_vector_length;
|
|
int sample_variance_threshold;
|
|
|
|
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[4]; /* stride for each plan */
|
|
|
|
const uint8_t *vp56_coord_div;
|
|
VP56ParseVectorAdjustment parse_vector_adjustment;
|
|
VP56Filter filter;
|
|
VP56ParseCoeff parse_coeff;
|
|
VP56DefaultModelsInit default_models_init;
|
|
VP56ParseVectorModels parse_vector_models;
|
|
VP56ParseCoeffModels parse_coeff_models;
|
|
VP56ParseHeader parse_header;
|
|
|
|
/* for "slice" parallelism between YUV and A */
|
|
VP56Context *alpha_context;
|
|
|
|
VP56Model *modelp;
|
|
VP56Model model;
|
|
|
|
/* 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 */
|
|
};
|
|
|
|
|
|
int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
|
|
int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s,
|
|
int flip, int has_alpha);
|
|
int ff_vp56_free(AVCodecContext *avctx);
|
|
int ff_vp56_free_context(VP56Context *s);
|
|
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
|
|
*/
|
|
|
|
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)
|
|
{
|
|
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;
|
|
}
|
|
|
|
#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 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;
|
|
|
|
c->high = bit ? c->high - low : low;
|
|
c->code_word = bit ? code_word - low_shift : code_word;
|
|
|
|
return bit;
|
|
}
|
|
#endif
|
|
|
|
#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 << 16;
|
|
int bit = code_word >= low_shift;
|
|
if (bit) {
|
|
c->high -= low;
|
|
code_word -= low_shift;
|
|
} else {
|
|
c->high = low;
|
|
}
|
|
|
|
c->code_word = code_word;
|
|
return bit;
|
|
}
|
|
|
|
// 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;
|
|
|
|
while (bits--) {
|
|
value = (value << 1) | vp56_rac_get(c);
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
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 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]))
|
|
tree += tree->val;
|
|
else
|
|
tree++;
|
|
}
|
|
return -tree->val;
|
|
}
|
|
|
|
// 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)
|
|
{
|
|
int i = 0;
|
|
|
|
do {
|
|
i = tree[i][vp56_rac_get_prob(c, probs[i])];
|
|
} while (i > 0);
|
|
|
|
return -i;
|
|
}
|
|
|
|
// 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 */
|