har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factorize state_transition init out.

Browse Source 
Originally committed as revision 25559 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-10-24 12:31:00 +00:00
parent c55f891c2f
commit 6019cd9ff2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ffv1.c
View File

@ -629,8 +629,7 @@ static void write_header(FFV1Context *f){
put_symbol(c, state, f->ac, 0); put_symbol(c, state, f->ac, 0);
if(f->ac>1){ if(f->ac>1){
for(i=1; i<256; i++){ for(i=1; i<256; i++){
f->state_transition[i]=ver2_state[i]; put_symbol(c, state, f->state_transition[i] - c->one_state[i], 1);
put_symbol(c, state, ver2_state[i] - c->one_state[i], 1);
} }
} }
put_symbol(c, state, f->colorspace, 0); //YUV cs type put_symbol(c, state, f->colorspace, 0); //YUV cs type
@ -751,8 +750,7 @@ static int write_extra_header(FFV1Context *f){
put_symbol(c, state, f->ac, 0); put_symbol(c, state, f->ac, 0);
if(f->ac>1){ if(f->ac>1){
for(i=1; i<256; i++){ for(i=1; i<256; i++){
f->state_transition[i]=ver2_state[i]; put_symbol(c, state, f->state_transition[i] - c->one_state[i], 1);
put_symbol(c, state, ver2_state[i] - c->one_state[i], 1);
} }
} }
put_symbol(c, state, f->colorspace, 0); //YUV cs type put_symbol(c, state, f->colorspace, 0); //YUV cs type
@ -783,6 +781,10 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->version=0; s->version=0;
s->ac= avctx->coder_type ? 2:0; s->ac= avctx->coder_type ? 2:0;
if(s->ac>1)
for(i=1; i<256; i++)
s->state_transition[i]=ver2_state[i];
s->plane_count=2; s->plane_count=2;
for(i=0; i<256; i++){ for(i=0; i<256; i++){
s->quant_table_count=2; s->quant_table_count=2;