Mercurial > libavcodec.hg
comparison h264.c @ 11191:5e583a785508 libavcodec
Move check for and call of predict_field_decoding_flag() from the mb code to
the row code. This function would only be needed on a MB basis for MBAFF+FMO
| author | michael |
|---|---|
| date | Wed, 17 Feb 2010 02:14:02 +0000 |
| parents | d092ec99cb59 |
| children | e1b4f03037d5 |
comparison
equal
deleted
inserted
replaced
| 11190:afc60af2d008 | 11191:5e583a785508 |
|---|---|
| 2255 loop_filter(h); | 2255 loop_filter(h); |
| 2256 ff_draw_horiz_band(s, 16*s->mb_y, 16); | 2256 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2257 ++s->mb_y; | 2257 ++s->mb_y; |
| 2258 if(FIELD_OR_MBAFF_PICTURE) { | 2258 if(FIELD_OR_MBAFF_PICTURE) { |
| 2259 ++s->mb_y; | 2259 ++s->mb_y; |
| 2260 if(FRAME_MBAFF && s->mb_y < s->mb_height) | |
| 2261 predict_field_decoding_flag(h); | |
| 2260 } | 2262 } |
| 2261 } | 2263 } |
| 2262 | 2264 |
| 2263 if( eos || s->mb_y >= s->mb_height ) { | 2265 if( eos || s->mb_y >= s->mb_height ) { |
| 2264 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); | 2266 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
| 2293 loop_filter(h); | 2295 loop_filter(h); |
| 2294 ff_draw_horiz_band(s, 16*s->mb_y, 16); | 2296 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2295 ++s->mb_y; | 2297 ++s->mb_y; |
| 2296 if(FIELD_OR_MBAFF_PICTURE) { | 2298 if(FIELD_OR_MBAFF_PICTURE) { |
| 2297 ++s->mb_y; | 2299 ++s->mb_y; |
| 2300 if(FRAME_MBAFF && s->mb_y < s->mb_height) | |
| 2301 predict_field_decoding_flag(h); | |
| 2298 } | 2302 } |
| 2299 if(s->mb_y >= s->mb_height){ | 2303 if(s->mb_y >= s->mb_height){ |
| 2300 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); | 2304 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
| 2301 | 2305 |
| 2302 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) { | 2306 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) { |