Mercurial > libavcodec.hg
comparison motion_est.c @ 4326:9af83350d4fd libavcodec
test DIRECT{0,0} too if flag mv0 is used
slight PSNR/bitrate increase
author | michael |
---|---|
date | Fri, 22 Dec 2006 23:30:57 +0000 |
parents | 8e11023556c3 |
children | a96d905dcbaa |
comparison
equal
deleted
inserted
replaced
4325:e2621acf32f1 | 4326:9af83350d4fd |
---|---|
1976 if(fimin < INT_MAX && bimin < INT_MAX){ | 1976 if(fimin < INT_MAX && bimin < INT_MAX){ |
1977 type |= CANDIDATE_MB_TYPE_BIDIR_I; | 1977 type |= CANDIDATE_MB_TYPE_BIDIR_I; |
1978 } | 1978 } |
1979 //FIXME something smarter | 1979 //FIXME something smarter |
1980 if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //dont try direct mode if its invalid for this MB | 1980 if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //dont try direct mode if its invalid for this MB |
1981 if(s->codec_id == CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT && s->flags&CODEC_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy]) | |
1982 type |= CANDIDATE_MB_TYPE_DIRECT0; | |
1981 #if 0 | 1983 #if 0 |
1982 if(s->out_format == FMT_MPEG1) | 1984 if(s->out_format == FMT_MPEG1) |
1983 type |= CANDIDATE_MB_TYPE_INTRA; | 1985 type |= CANDIDATE_MB_TYPE_INTRA; |
1984 #endif | 1986 #endif |
1985 } | 1987 } |