RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the case with swaping states 127 and 129 in ffv1 

Originally committed as revision 25562 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-10-24 12:35:42 +00:00
parent 98d2f7a47f
commit 19591033f7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ffv1.c
View File

@ -896,19 +896,23 @@ static av_cold int encode_init(AVCodecContext *avctx)
double size0= COST2(i, i ) + COST2(i2, i2);
double sizeX= COST2(i, i2) + COST2(i2, i );
if(sizeX < size0 && i!=128 && i2!=128){ //128 is special we cant swap it around FIXME 127<->129 swap
if(sizeX < size0 && i!=128 && i2!=128){
int j;
FFSWAP(int, s->state_transition[ i], s->state_transition[ i2]);
FFSWAP(int, s->state_transition[256-i], s->state_transition[256-i2]);
FFSWAP(int, s->rc_stat[i ][0],s->rc_stat[ i2][0]);
FFSWAP(int, s->rc_stat[i ][1],s->rc_stat[ i2][1]);
if(i != 256-i2){
FFSWAP(int, s->state_transition[256-i], s->state_transition[256-i2]);
FFSWAP(int, s->rc_stat[256-i][0],s->rc_stat[256-i2][0]);
FFSWAP(int, s->rc_stat[256-i][1],s->rc_stat[256-i2][1]);
}
for(j=1; j<256; j++){
if (s->state_transition[j] == i ) s->state_transition[j] = i2;
else if(s->state_transition[j] == i2) s->state_transition[j] = i ;
if(i != 256-i2){
if (s->state_transition[256-j] == 256-i ) s->state_transition[256-j] = 256-i2;
else if(s->state_transition[256-j] == 256-i2) s->state_transition[256-j] = 256-i ;
}
}
changed=1;
}