Mercurial > libavcodec.hg
comparison snow.c @ 2995:dfc271b90fe6 libavcodec
4mv + iter ME 10l fix (still not bugfree but better)
| author | michael |
|---|---|
| date | Thu, 29 Dec 2005 02:17:51 +0000 |
| parents | 657e8546090d |
| children | 733ceb1e079e |
comparison
equal
deleted
inserted
replaced
| 2994:657e8546090d | 2995:dfc271b90fe6 |
|---|---|
| 2292 return; | 2292 return; |
| 2293 } | 2293 } |
| 2294 | 2294 |
| 2295 if(level!=s->block_max_depth){ | 2295 if(level!=s->block_max_depth){ |
| 2296 if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){ | 2296 if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){ |
| 2297 put_rac(&s->c, &s->block_state[4 + s_context], 1); | |
| 2298 }else{ | |
| 2297 put_rac(&s->c, &s->block_state[4 + s_context], 0); | 2299 put_rac(&s->c, &s->block_state[4 + s_context], 0); |
| 2298 encode_q_branch2(s, level+1, 2*x+0, 2*y+0); | 2300 encode_q_branch2(s, level+1, 2*x+0, 2*y+0); |
| 2299 encode_q_branch2(s, level+1, 2*x+1, 2*y+0); | 2301 encode_q_branch2(s, level+1, 2*x+1, 2*y+0); |
| 2300 encode_q_branch2(s, level+1, 2*x+0, 2*y+1); | 2302 encode_q_branch2(s, level+1, 2*x+0, 2*y+1); |
| 2301 encode_q_branch2(s, level+1, 2*x+1, 2*y+1); | 2303 encode_q_branch2(s, level+1, 2*x+1, 2*y+1); |
| 2302 return; | 2304 return; |
| 2303 }else{ | |
| 2304 put_rac(&s->c, &s->block_state[4 + s_context], 1); | |
| 2305 } | 2305 } |
| 2306 } | 2306 } |
| 2307 if(b->type & BLOCK_INTRA){ | 2307 if(b->type & BLOCK_INTRA){ |
| 2308 put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 1); | 2308 put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 1); |
| 2309 put_symbol(&s->c, &s->block_state[32], b->color[0]-pl , 1); | 2309 put_symbol(&s->c, &s->block_state[32], b->color[0]-pl , 1); |