|
|
@ -236,7 +236,7 @@ static int vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[], |
|
|
|
FF_HUFFMAN_FLAG_HNODE_FIRST); |
|
|
|
FF_HUFFMAN_FLAG_HNODE_FIRST); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static void vp6_parse_coeff_models(VP56Context *s) |
|
|
|
static int vp6_parse_coeff_models(VP56Context *s) |
|
|
|
{ |
|
|
|
{ |
|
|
|
VP56RangeCoder *c = &s->c; |
|
|
|
VP56RangeCoder *c = &s->c; |
|
|
|
VP56Model *model = s->modelp; |
|
|
|
VP56Model *model = s->modelp; |
|
|
@ -281,15 +281,18 @@ static void vp6_parse_coeff_models(VP56Context *s) |
|
|
|
|
|
|
|
|
|
|
|
if (s->use_huffman) { |
|
|
|
if (s->use_huffman) { |
|
|
|
for (pt=0; pt<2; pt++) { |
|
|
|
for (pt=0; pt<2; pt++) { |
|
|
|
vp6_build_huff_tree(s, model->coeff_dccv[pt], |
|
|
|
if (vp6_build_huff_tree(s, model->coeff_dccv[pt], |
|
|
|
vp6_huff_coeff_map, 12, &s->dccv_vlc[pt]); |
|
|
|
vp6_huff_coeff_map, 12, &s->dccv_vlc[pt])) |
|
|
|
vp6_build_huff_tree(s, model->coeff_runv[pt], |
|
|
|
return -1; |
|
|
|
vp6_huff_run_map, 9, &s->runv_vlc[pt]); |
|
|
|
if (vp6_build_huff_tree(s, model->coeff_runv[pt], |
|
|
|
|
|
|
|
vp6_huff_run_map, 9, &s->runv_vlc[pt])) |
|
|
|
|
|
|
|
return -1; |
|
|
|
for (ct=0; ct<3; ct++) |
|
|
|
for (ct=0; ct<3; ct++) |
|
|
|
for (cg = 0; cg < 6; cg++) |
|
|
|
for (cg = 0; cg < 6; cg++) |
|
|
|
vp6_build_huff_tree(s, model->coeff_ract[pt][ct][cg], |
|
|
|
if (vp6_build_huff_tree(s, model->coeff_ract[pt][ct][cg], |
|
|
|
vp6_huff_coeff_map, 12, |
|
|
|
vp6_huff_coeff_map, 12, |
|
|
|
&s->ract_vlc[pt][ct][cg]); |
|
|
|
&s->ract_vlc[pt][ct][cg])) |
|
|
|
|
|
|
|
return -1; |
|
|
|
} |
|
|
|
} |
|
|
|
memset(s->nb_null, 0, sizeof(s->nb_null)); |
|
|
|
memset(s->nb_null, 0, sizeof(s->nb_null)); |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -299,6 +302,7 @@ static void vp6_parse_coeff_models(VP56Context *s) |
|
|
|
for (node=0; node<5; node++) |
|
|
|
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); |
|
|
|
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); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect) |
|
|
|
static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect) |
|
|
|