Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

move all model related tables into their own struct

Browse Source 
Originally committed as revision 10571 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 18 years ago
parent 1218a7e33d
commit 247df384ec
4 changed files with 119 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      libavcodec/vp5.c
  2. 36
      libavcodec/vp56.c
  3. 35
      libavcodec/vp56.h
  4. 80
      libavcodec/vp6.c

67
libavcodec/vp5.c
Unescape View File

@ -88,16 +88,17 @@ static int vp5_adjust(int v, int t)
static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int comp, di; int comp, di;
for (comp=0; comp<2; comp++) { for (comp=0; comp<2; comp++) {
int delta = 0; int delta = 0;
if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) { if (vp56_rac_get_prob(c, model->vector_dct[comp])) {
int sign = vp56_rac_get_prob(c, s->vector_model_sig[comp]); int sign = vp56_rac_get_prob(c, model->vector_sig[comp]);
di = vp56_rac_get_prob(c, s->vector_model_pdi[comp][0]); di = vp56_rac_get_prob(c, model->vector_pdi[comp][0]);
di |= vp56_rac_get_prob(c, s->vector_model_pdi[comp][1]) << 1; di |= vp56_rac_get_prob(c, model->vector_pdi[comp][1]) << 1;
delta = vp56_rac_get_tree(c, vp56_pva_tree, delta = vp56_rac_get_tree(c, vp56_pva_tree,
s->vector_model_pdv[comp]); model->vector_pdv[comp]);
delta = di | (delta << 2); delta = di | (delta << 2);
delta = (delta ^ -sign) + sign; delta = (delta ^ -sign) + sign;
} }
@ -111,28 +112,30 @@ static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
static void vp5_parse_vector_models(vp56_context_t *s) static void vp5_parse_vector_models(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int comp, node; int comp, node;
for (comp=0; comp<2; comp++) { for (comp=0; comp<2; comp++) {
if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][0])) if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][0]))
s->vector_model_dct[comp] = vp56_rac_gets_nn(c, 7); model->vector_dct[comp] = vp56_rac_gets_nn(c, 7);
if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][1])) if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][1]))
s->vector_model_sig[comp] = vp56_rac_gets_nn(c, 7); model->vector_sig[comp] = vp56_rac_gets_nn(c, 7);
if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][2])) if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][2]))
s->vector_model_pdi[comp][0] = vp56_rac_gets_nn(c, 7); model->vector_pdi[comp][0] = vp56_rac_gets_nn(c, 7);
if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][3])) if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][3]))
s->vector_model_pdi[comp][1] = vp56_rac_gets_nn(c, 7); model->vector_pdi[comp][1] = vp56_rac_gets_nn(c, 7);
} }
for (comp=0; comp<2; comp++) for (comp=0; comp<2; comp++)
for (node=0; node<7; node++) for (node=0; node<7; node++)
if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][4 + node])) if (vp56_rac_get_prob(c, vp5_vmc_pct[comp][4 + node]))
s->vector_model_pdv[comp][node] = vp56_rac_gets_nn(c, 7); 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(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
uint8_t def_prob[11]; uint8_t def_prob[11];
int node, cg, ctx; int node, cg, ctx;
int ct; /* code type */ int ct; /* code type */
@ -144,9 +147,9 @@ static void vp5_parse_coeff_models(vp56_context_t *s)
for (node=0; node<11; node++) for (node=0; node<11; node++)
if (vp56_rac_get_prob(c, vp5_dccv_pct[pt][node])) { if (vp56_rac_get_prob(c, vp5_dccv_pct[pt][node])) {
def_prob[node] = vp56_rac_gets_nn(c, 7); def_prob[node] = vp56_rac_gets_nn(c, 7);
s->coeff_model_dccv[pt][node] = def_prob[node]; model->coeff_dccv[pt][node] = def_prob[node];
} else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
s->coeff_model_dccv[pt][node] = def_prob[node]; model->coeff_dccv[pt][node] = def_prob[node];
} }
for (ct=0; ct<3; ct++) for (ct=0; ct<3; ct++)
@ -155,31 +158,32 @@ static void vp5_parse_coeff_models(vp56_context_t *s)
for (node=0; node<11; node++) for (node=0; node<11; node++)
if (vp56_rac_get_prob(c, vp5_ract_pct[ct][pt][cg][node])) { if (vp56_rac_get_prob(c, vp5_ract_pct[ct][pt][cg][node])) {
def_prob[node] = vp56_rac_gets_nn(c, 7); def_prob[node] = vp56_rac_gets_nn(c, 7);
s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; model->coeff_ract[pt][ct][cg][node] = def_prob[node];
} else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; model->coeff_ract[pt][ct][cg][node] = def_prob[node];
} }
/* coeff_model_dcct is a linear combination of coeff_model_dccv */ /* coeff_dcct is a linear combination of coeff_dccv */
for (pt=0; pt<2; pt++) for (pt=0; pt<2; pt++)
for (ctx=0; ctx<36; ctx++) for (ctx=0; ctx<36; ctx++)
for (node=0; node<5; node++) for (node=0; node<5; node++)
s->coeff_model_dcct[pt][ctx][node] = av_clip(((s->coeff_model_dccv[pt][node] * vp5_dccv_lc[node][ctx][0] + 128) >> 8) + vp5_dccv_lc[node][ctx][1], 1, 254); model->coeff_dcct[pt][ctx][node] = av_clip(((model->coeff_dccv[pt][node] * vp5_dccv_lc[node][ctx][0] + 128) >> 8) + vp5_dccv_lc[node][ctx][1], 1, 254);
/* coeff_model_acct is a linear combination of coeff_model_ract */ /* coeff_acct is a linear combination of coeff_ract */
for (ct=0; ct<3; ct++) for (ct=0; ct<3; ct++)
for (pt=0; pt<2; pt++) for (pt=0; pt<2; pt++)
for (cg=0; cg<3; cg++) for (cg=0; cg<3; cg++)
for (ctx=0; ctx<6; ctx++) for (ctx=0; ctx<6; ctx++)
for (node=0; node<5; node++) for (node=0; node<5; node++)
s->coeff_model_acct[pt][ct][cg][ctx][node] = av_clip(((s->coeff_model_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); 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(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
uint8_t *permute = s->scantable.permutated; uint8_t *permute = s->scantable.permutated;
uint8_t *model, *model2; uint8_t *model1, *model2;
int coeff, sign, coeff_idx; int coeff, sign, coeff_idx;
int b, i, cg, idx, ctx, ctx_last; int b, i, cg, idx, ctx, ctx_last;
int pt = 0; /* plane type (0 for Y, 1 for U or V) */ int pt = 0; /* plane type (0 for Y, 1 for U or V) */
@ -191,22 +195,22 @@ static void vp5_parse_coeff(vp56_context_t *s)
ctx = 6*s->coeff_ctx[vp56_b6to4[b]][0] ctx = 6*s->coeff_ctx[vp56_b6to4[b]][0]
+ s->above_blocks[s->above_block_idx[b]].not_null_dc; + s->above_blocks[s->above_block_idx[b]].not_null_dc;
model = s->coeff_model_dccv[pt]; model1 = model->coeff_dccv[pt];
model2 = s->coeff_model_dcct[pt][ctx]; model2 = model->coeff_dcct[pt][ctx];
for (coeff_idx=0; coeff_idx<64; ) { for (coeff_idx=0; coeff_idx<64; ) {
if (vp56_rac_get_prob(c, model2[0])) { if (vp56_rac_get_prob(c, model2[0])) {
if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[2])) {
if (vp56_rac_get_prob(c, model2[3])) { if (vp56_rac_get_prob(c, model2[3])) {
s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 4; s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 4;
idx = vp56_rac_get_tree(c, vp56_pc_tree, model); idx = vp56_rac_get_tree(c, vp56_pc_tree, model1);
sign = vp56_rac_get(c); sign = vp56_rac_get(c);
coeff = vp56_coeff_bias[idx]; coeff = vp56_coeff_bias[idx];
for (i=vp56_coeff_bit_length[idx]; i>=0; i--) for (i=vp56_coeff_bit_length[idx]; i>=0; i--)
coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i; coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i;
} else { } else {
if (vp56_rac_get_prob(c, model2[4])) { if (vp56_rac_get_prob(c, model2[4])) {
coeff = 3 + vp56_rac_get_prob(c, model[5]); coeff = 3 + vp56_rac_get_prob(c, model1[5]);
s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 3; s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 3;
} else { } else {
coeff = 2; coeff = 2;
@ -234,8 +238,8 @@ static void vp5_parse_coeff(vp56_context_t *s)
cg = vp5_coeff_groups[++coeff_idx]; cg = vp5_coeff_groups[++coeff_idx];
ctx = s->coeff_ctx[vp56_b6to4[b]][coeff_idx]; ctx = s->coeff_ctx[vp56_b6to4[b]][coeff_idx];
model = s->coeff_model_ract[pt][ct][cg]; model1 = model->coeff_ract[pt][ct][cg];
model2 = cg > 2 ? model : s->coeff_model_acct[pt][ct][cg][ctx]; model2 = cg > 2 ? model1 : model->coeff_acct[pt][ct][cg][ctx];
} }
ctx_last = FFMIN(s->coeff_ctx_last[vp56_b6to4[b]], 24); ctx_last = FFMIN(s->coeff_ctx_last[vp56_b6to4[b]], 24);
@ -249,16 +253,17 @@ static void vp5_parse_coeff(vp56_context_t *s)
static void vp5_default_models_init(vp56_context_t *s) static void vp5_default_models_init(vp56_context_t *s)
{ {
vp56_model_t *model = s->modelp;
int i; int i;
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
s->vector_model_sig[i] = 0x80; model->vector_sig[i] = 0x80;
s->vector_model_dct[i] = 0x80; model->vector_dct[i] = 0x80;
s->vector_model_pdi[i][0] = 0x55; model->vector_pdi[i][0] = 0x55;
s->vector_model_pdi[i][1] = 0x80; model->vector_pdi[i][1] = 0x80;
} }
memcpy(s->mb_types_stats, vp56_def_mb_types_stats, sizeof(s->mb_types_stats)); memcpy(model->mb_types_stats, vp56_def_mb_types_stats, sizeof(model->mb_types_stats));
memset(s->vector_model_pdv, 0x80, sizeof(s->vector_model_pdv)); memset(model->vector_pdv, 0x80, sizeof(model->vector_pdv));
} }
static int vp5_decode_init(AVCodecContext *avctx) static int vp5_decode_init(AVCodecContext *avctx)

36
libavcodec/vp56.c
Unescape View File

@ -75,13 +75,15 @@ static int vp56_get_vectors_predictors(vp56_context_t *s, int row, int col,
static void vp56_parse_mb_type_models(vp56_context_t *s) static void vp56_parse_mb_type_models(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int i, ctx, type; int i, ctx, type;
for (ctx=0; ctx<3; ctx++) { for (ctx=0; ctx<3; ctx++) {
if (vp56_rac_get_prob(c, 174)) { if (vp56_rac_get_prob(c, 174)) {
int idx = vp56_rac_gets(c, 4); int idx = vp56_rac_gets(c, 4);
memcpy(s->mb_types_stats[ctx],vp56_pre_def_mb_type_stats[idx][ctx], memcpy(model->mb_types_stats[ctx],
sizeof(s->mb_types_stats[ctx])); vp56_pre_def_mb_type_stats[idx][ctx],
sizeof(model->mb_types_stats[ctx]));
} }
if (vp56_rac_get_prob(c, 254)) { if (vp56_rac_get_prob(c, 254)) {
for (type=0; type<10; type++) { for (type=0; type<10; type++) {
@ -93,7 +95,7 @@ static void vp56_parse_mb_type_models(vp56_context_t *s)
vp56_mb_type_model_model); vp56_mb_type_model_model);
if (!delta) if (!delta)
delta = 4 * vp56_rac_gets(c, 7); delta = 4 * vp56_rac_gets(c, 7);
s->mb_types_stats[ctx][type][i] += (delta ^ -sign) + sign; model->mb_types_stats[ctx][type][i] += (delta ^ -sign) + sign;
} }
} }
} }
@ -105,13 +107,13 @@ static void vp56_parse_mb_type_models(vp56_context_t *s)
int p[10]; int p[10];
for (type=0; type<10; type++) for (type=0; type<10; type++)
p[type] = 100 * s->mb_types_stats[ctx][type][1]; p[type] = 100 * model->mb_types_stats[ctx][type][1];
for (type=0; type<10; type++) { for (type=0; type<10; type++) {
int p02, p34, p0234, p17, p56, p89, p5689, p156789; int p02, p34, p0234, p17, p56, p89, p5689, p156789;
/* conservative MB type probability */ /* conservative MB type probability */
s->mb_type_model[ctx][type][0] = 255 - (255 * s->mb_types_stats[ctx][type][0]) / (1 + s->mb_types_stats[ctx][type][0] + s->mb_types_stats[ctx][type][1]); model->mb_type[ctx][type][0] = 255 - (255 * model->mb_types_stats[ctx][type][0]) / (1 + model->mb_types_stats[ctx][type][0] + model->mb_types_stats[ctx][type][1]);
p[type] = 0; /* same MB type => weight is null */ p[type] = 0; /* same MB type => weight is null */
@ -125,18 +127,18 @@ static void vp56_parse_mb_type_models(vp56_context_t *s)
p5689 = p56 + p89; p5689 = p56 + p89;
p156789 = p17 + p5689; p156789 = p17 + p5689;
s->mb_type_model[ctx][type][1] = 1 + 255 * p0234/(1+p0234+p156789); model->mb_type[ctx][type][1] = 1 + 255 * p0234/(1+p0234+p156789);
s->mb_type_model[ctx][type][2] = 1 + 255 * p02 / (1+p0234); model->mb_type[ctx][type][2] = 1 + 255 * p02 / (1+p0234);
s->mb_type_model[ctx][type][3] = 1 + 255 * p17 / (1+p156789); model->mb_type[ctx][type][3] = 1 + 255 * p17 / (1+p156789);
s->mb_type_model[ctx][type][4] = 1 + 255 * p[0] / (1+p02); model->mb_type[ctx][type][4] = 1 + 255 * p[0] / (1+p02);
s->mb_type_model[ctx][type][5] = 1 + 255 * p[3] / (1+p34); model->mb_type[ctx][type][5] = 1 + 255 * p[3] / (1+p34);
s->mb_type_model[ctx][type][6] = 1 + 255 * p[1] / (1+p17); model->mb_type[ctx][type][6] = 1 + 255 * p[1] / (1+p17);
s->mb_type_model[ctx][type][7] = 1 + 255 * p56 / (1+p5689); model->mb_type[ctx][type][7] = 1 + 255 * p56 / (1+p5689);
s->mb_type_model[ctx][type][8] = 1 + 255 * p[5] / (1+p56); model->mb_type[ctx][type][8] = 1 + 255 * p[5] / (1+p56);
s->mb_type_model[ctx][type][9] = 1 + 255 * p[8] / (1+p89); model->mb_type[ctx][type][9] = 1 + 255 * p[8] / (1+p89);
/* restore initial value */ /* restore initial value */
p[type] = 100 * s->mb_types_stats[ctx][type][1]; p[type] = 100 * model->mb_types_stats[ctx][type][1];
} }
} }
} }
@ -144,7 +146,7 @@ static void vp56_parse_mb_type_models(vp56_context_t *s)
static vp56_mb_t vp56_parse_mb_type(vp56_context_t *s, static vp56_mb_t vp56_parse_mb_type(vp56_context_t *s,
vp56_mb_t prev_type, int ctx) vp56_mb_t prev_type, int ctx)
{ {
uint8_t *mb_type_model = s->mb_type_model[ctx][prev_type]; uint8_t *mb_type_model = s->modelp->mb_type[ctx][prev_type];
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
if (vp56_rac_get_prob(c, mb_type_model[0])) if (vp56_rac_get_prob(c, mb_type_model[0]))
@ -501,6 +503,8 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int golden_frame = 0; int golden_frame = 0;
int res; int res;
s->modelp = &s->models;
res = s->parse_header(s, buf, buf_size, &golden_frame); res = s->parse_header(s, buf, buf_size, &golden_frame);
if (!res) if (!res)
return -1; return -1;

35
libavcodec/vp56.h
Unescape View File

@ -69,6 +69,23 @@ typedef struct {
vp56_mv_t mv; vp56_mv_t mv;
} vp56_macroblock_t; } vp56_macroblock_t;
typedef struct {
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 */
} vp56_model_t;
struct vp56_context { struct vp56_context {
AVCodecContext *avctx; AVCodecContext *avctx;
DSPContext dsp; DSPContext dsp;
@ -103,8 +120,6 @@ struct vp56_context {
vp56_mb_t mb_type; vp56_mb_t mb_type;
vp56_macroblock_t *macroblocks; vp56_macroblock_t *macroblocks;
DECLARE_ALIGNED_16(DCTELEM, block_coeff[6][64]); 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 */
/* motion vectors */ /* motion vectors */
vp56_mv_t mv[6]; /* vectors for each block in MB */ vp56_mv_t mv[6]; /* vectors for each block in MB */
@ -119,19 +134,6 @@ struct vp56_context {
int max_vector_length; int max_vector_length;
int sample_variance_threshold; 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[4][64]; /* used in vp5 only */
uint8_t coeff_ctx_last[4]; /* used in vp5 only */ uint8_t coeff_ctx_last[4]; /* used in vp5 only */
@ -150,6 +152,9 @@ struct vp56_context {
vp56_parse_vector_models_t parse_vector_models; vp56_parse_vector_models_t parse_vector_models;
vp56_parse_coeff_models_t parse_coeff_models; vp56_parse_coeff_models_t parse_coeff_models;
vp56_parse_header_t parse_header; vp56_parse_header_t parse_header;
vp56_model_t *modelp;
vp56_model_t models;
}; };

80
libavcodec/vp6.c
Unescape View File

@ -145,25 +145,27 @@ static void vp6_coeff_order_table_init(vp56_context_t *s)
{ {
int i, pos, idx = 1; int i, pos, idx = 1;
s->coeff_index_to_pos[0] = 0; s->modelp->coeff_index_to_pos[0] = 0;
for (i=0; i<16; i++) for (i=0; i<16; i++)
for (pos=1; pos<64; pos++) for (pos=1; pos<64; pos++)
if (s->coeff_reorder[pos] == i) if (s->modelp->coeff_reorder[pos] == i)
s->coeff_index_to_pos[idx++] = pos; s->modelp->coeff_index_to_pos[idx++] = pos;
} }
static void vp6_default_models_init(vp56_context_t *s) static void vp6_default_models_init(vp56_context_t *s)
{ {
s->vector_model_dct[0] = 0xA2; vp56_model_t *model = s->modelp;
s->vector_model_dct[1] = 0xA4;
s->vector_model_sig[0] = 0x80;
s->vector_model_sig[1] = 0x80;
memcpy(s->mb_types_stats, vp56_def_mb_types_stats, sizeof(s->mb_types_stats)); model->vector_dct[0] = 0xA2;
memcpy(s->vector_model_fdv, vp6_def_fdv_vector_model, sizeof(s->vector_model_fdv)); model->vector_dct[1] = 0xA4;
memcpy(s->vector_model_pdv, vp6_def_pdv_vector_model, sizeof(s->vector_model_pdv)); model->vector_sig[0] = 0x80;
memcpy(s->coeff_model_runv, vp6_def_runv_coeff_model, sizeof(s->coeff_model_runv)); model->vector_sig[1] = 0x80;
memcpy(s->coeff_reorder, vp6_def_coeff_reorder, sizeof(s->coeff_reorder));
memcpy(model->mb_types_stats, vp56_def_mb_types_stats, sizeof(model->mb_types_stats));
memcpy(model->vector_fdv, vp6_def_fdv_vector_model, sizeof(model->vector_fdv));
memcpy(model->vector_pdv, vp6_def_pdv_vector_model, sizeof(model->vector_pdv));
memcpy(model->coeff_runv, vp6_def_runv_coeff_model, sizeof(model->coeff_runv));
memcpy(model->coeff_reorder, vp6_def_coeff_reorder, sizeof(model->coeff_reorder));
vp6_coeff_order_table_init(s); vp6_coeff_order_table_init(s);
} }
@ -171,29 +173,31 @@ static void vp6_default_models_init(vp56_context_t *s)
static void vp6_parse_vector_models(vp56_context_t *s) static void vp6_parse_vector_models(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int comp, node; int comp, node;
for (comp=0; comp<2; comp++) { for (comp=0; comp<2; comp++) {
if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][0])) if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][0]))
s->vector_model_dct[comp] = vp56_rac_gets_nn(c, 7); model->vector_dct[comp] = vp56_rac_gets_nn(c, 7);
if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][1])) if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][1]))
s->vector_model_sig[comp] = vp56_rac_gets_nn(c, 7); model->vector_sig[comp] = vp56_rac_gets_nn(c, 7);
} }
for (comp=0; comp<2; comp++) for (comp=0; comp<2; comp++)
for (node=0; node<7; node++) for (node=0; node<7; node++)
if (vp56_rac_get_prob(c, vp6_pdv_pct[comp][node])) if (vp56_rac_get_prob(c, vp6_pdv_pct[comp][node]))
s->vector_model_pdv[comp][node] = vp56_rac_gets_nn(c, 7); model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7);
for (comp=0; comp<2; comp++) for (comp=0; comp<2; comp++)
for (node=0; node<8; node++) for (node=0; node<8; node++)
if (vp56_rac_get_prob(c, vp6_fdv_pct[comp][node])) if (vp56_rac_get_prob(c, vp6_fdv_pct[comp][node]))
s->vector_model_fdv[comp][node] = vp56_rac_gets_nn(c, 7); model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7);
} }
static void vp6_parse_coeff_models(vp56_context_t *s) static void vp6_parse_coeff_models(vp56_context_t *s)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int def_prob[11]; int def_prob[11];
int node, cg, ctx, pos; int node, cg, ctx, pos;
int ct; /* code type */ int ct; /* code type */
@ -205,22 +209,22 @@ static void vp6_parse_coeff_models(vp56_context_t *s)
for (node=0; node<11; node++) for (node=0; node<11; node++)
if (vp56_rac_get_prob(c, vp6_dccv_pct[pt][node])) { if (vp56_rac_get_prob(c, vp6_dccv_pct[pt][node])) {
def_prob[node] = vp56_rac_gets_nn(c, 7); def_prob[node] = vp56_rac_gets_nn(c, 7);
s->coeff_model_dccv[pt][node] = def_prob[node]; model->coeff_dccv[pt][node] = def_prob[node];
} else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
s->coeff_model_dccv[pt][node] = def_prob[node]; model->coeff_dccv[pt][node] = def_prob[node];
} }
if (vp56_rac_get(c)) { if (vp56_rac_get(c)) {
for (pos=1; pos<64; pos++) for (pos=1; pos<64; pos++)
if (vp56_rac_get_prob(c, vp6_coeff_reorder_pct[pos])) if (vp56_rac_get_prob(c, vp6_coeff_reorder_pct[pos]))
s->coeff_reorder[pos] = vp56_rac_gets(c, 4); model->coeff_reorder[pos] = vp56_rac_gets(c, 4);
vp6_coeff_order_table_init(s); vp6_coeff_order_table_init(s);
} }
for (cg=0; cg<2; cg++) for (cg=0; cg<2; cg++)
for (node=0; node<14; node++) for (node=0; node<14; node++)
if (vp56_rac_get_prob(c, vp6_runv_pct[cg][node])) if (vp56_rac_get_prob(c, vp6_runv_pct[cg][node]))
s->coeff_model_runv[cg][node] = vp56_rac_gets_nn(c, 7); model->coeff_runv[cg][node] = vp56_rac_gets_nn(c, 7);
for (ct=0; ct<3; ct++) for (ct=0; ct<3; ct++)
for (pt=0; pt<2; pt++) for (pt=0; pt<2; pt++)
@ -228,21 +232,22 @@ static void vp6_parse_coeff_models(vp56_context_t *s)
for (node=0; node<11; node++) for (node=0; node<11; node++)
if (vp56_rac_get_prob(c, vp6_ract_pct[ct][pt][cg][node])) { if (vp56_rac_get_prob(c, vp6_ract_pct[ct][pt][cg][node])) {
def_prob[node] = vp56_rac_gets_nn(c, 7); def_prob[node] = vp56_rac_gets_nn(c, 7);
s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; model->coeff_ract[pt][ct][cg][node] = def_prob[node];
} else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; model->coeff_ract[pt][ct][cg][node] = def_prob[node];
} }
/* coeff_model_dcct is a linear combination of coeff_model_dccv */ /* coeff_dcct is a linear combination of coeff_dccv */
for (pt=0; pt<2; pt++) for (pt=0; pt<2; pt++)
for (ctx=0; ctx<3; ctx++) for (ctx=0; ctx<3; ctx++)
for (node=0; node<5; node++) for (node=0; node<5; node++)
s->coeff_model_dcct[pt][ctx][node] = av_clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255); 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(vp56_context_t *s, vp56_mv_t *vect)
{ {
vp56_range_coder_t *c = &s->c; vp56_range_coder_t *c = &s->c;
vp56_model_t *model = s->modelp;
int comp; int comp;
*vect = (vp56_mv_t) {0,0}; *vect = (vp56_mv_t) {0,0};
@ -252,22 +257,22 @@ static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
for (comp=0; comp<2; comp++) { for (comp=0; comp<2; comp++) {
int i, delta = 0; int i, delta = 0;
if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) { if (vp56_rac_get_prob(c, model->vector_dct[comp])) {
static const uint8_t prob_order[] = {0, 1, 2, 7, 6, 5, 4}; static const uint8_t prob_order[] = {0, 1, 2, 7, 6, 5, 4};
for (i=0; i<sizeof(prob_order); i++) { for (i=0; i<sizeof(prob_order); i++) {
int j = prob_order[i]; int j = prob_order[i];
delta |= vp56_rac_get_prob(c, s->vector_model_fdv[comp][j])<<j; delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][j])<<j;
} }
if (delta & 0xF0) if (delta & 0xF0)
delta |= vp56_rac_get_prob(c, s->vector_model_fdv[comp][3])<<3; delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][3])<<3;
else else
delta |= 8; delta |= 8;
} else { } else {
delta = vp56_rac_get_tree(c, vp56_pva_tree, delta = vp56_rac_get_tree(c, vp56_pva_tree,
s->vector_model_pdv[comp]); model->vector_pdv[comp]);
} }
if (delta && vp56_rac_get_prob(c, s->vector_model_sig[comp])) if (delta && vp56_rac_get_prob(c, model->vector_sig[comp]))
delta = -delta; delta = -delta;
if (!comp) if (!comp)
@ -280,8 +285,9 @@ static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
static void vp6_parse_coeff(vp56_context_t *s) static void vp6_parse_coeff(vp56_context_t *s)
{ {
vp56_range_coder_t *c = s->ccp; vp56_range_coder_t *c = s->ccp;
vp56_model_t *model = s->modelp;
uint8_t *permute = s->scantable.permutated; uint8_t *permute = s->scantable.permutated;
uint8_t *model, *model2, *model3; uint8_t *model1, *model2, *model3;
int coeff, sign, coeff_idx; int coeff, sign, coeff_idx;
int b, i, cg, idx, ctx; int b, i, cg, idx, ctx;
int pt = 0; /* plane type (0 for Y, 1 for U or V) */ int pt = 0; /* plane type (0 for Y, 1 for U or V) */
@ -294,21 +300,21 @@ static void vp6_parse_coeff(vp56_context_t *s)
ctx = s->left_block[vp56_b6to4[b]].not_null_dc ctx = s->left_block[vp56_b6to4[b]].not_null_dc
+ s->above_blocks[s->above_block_idx[b]].not_null_dc; + s->above_blocks[s->above_block_idx[b]].not_null_dc;
model = s->coeff_model_dccv[pt]; model1 = model->coeff_dccv[pt];
model2 = s->coeff_model_dcct[pt][ctx]; model2 = model->coeff_dcct[pt][ctx];
for (coeff_idx=0; coeff_idx<64; ) { for (coeff_idx=0; coeff_idx<64; ) {
if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) { if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) {
/* parse a coeff */ /* parse a coeff */
if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[2])) {
if (vp56_rac_get_prob(c, model2[3])) { if (vp56_rac_get_prob(c, model2[3])) {
idx = vp56_rac_get_tree(c, vp56_pc_tree, model); idx = vp56_rac_get_tree(c, vp56_pc_tree, model1);
coeff = vp56_coeff_bias[idx]; coeff = vp56_coeff_bias[idx];
for (i=vp56_coeff_bit_length[idx]; i>=0; i--) for (i=vp56_coeff_bit_length[idx]; i>=0; i--)
coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i; coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i;
} else { } else {
if (vp56_rac_get_prob(c, model2[4])) if (vp56_rac_get_prob(c, model2[4]))
coeff = 3 + vp56_rac_get_prob(c, model[5]); coeff = 3 + vp56_rac_get_prob(c, model1[5]);
else else
coeff = 2; coeff = 2;
} }
@ -321,7 +327,7 @@ static void vp6_parse_coeff(vp56_context_t *s)
coeff = (coeff ^ -sign) + sign; coeff = (coeff ^ -sign) + sign;
if (coeff_idx) if (coeff_idx)
coeff *= s->dequant_ac; coeff *= s->dequant_ac;
idx = s->coeff_index_to_pos[coeff_idx]; idx = model->coeff_index_to_pos[coeff_idx];
s->block_coeff[b][permute[idx]] = coeff; s->block_coeff[b][permute[idx]] = coeff;
run = 1; run = 1;
} else { } else {
@ -331,7 +337,7 @@ static void vp6_parse_coeff(vp56_context_t *s)
if (!vp56_rac_get_prob(c, model2[1])) if (!vp56_rac_get_prob(c, model2[1]))
break; break;
model3 = s->coeff_model_runv[coeff_idx >= 6]; model3 = model->coeff_runv[coeff_idx >= 6];
run = vp56_rac_get_tree(c, vp6_pcr_tree, model3); run = vp56_rac_get_tree(c, vp6_pcr_tree, model3);
if (!run) if (!run)
for (run=9, i=0; i<6; i++) for (run=9, i=0; i<6; i++)
@ -340,7 +346,7 @@ static void vp6_parse_coeff(vp56_context_t *s)
} }
cg = vp6_coeff_groups[coeff_idx+=run]; cg = vp6_coeff_groups[coeff_idx+=run];
model = model2 = s->coeff_model_ract[pt][ct][cg]; model1 = model2 = model->coeff_ract[pt][ct][cg];
} }
s->left_block[vp56_b6to4[b]].not_null_dc = s->left_block[vp56_b6to4[b]].not_null_dc =

Write Preview
Loading…
Cancel
Save