comparison h264.c @ 7327:483421b11d98 libavcodec

Fix h264_loop_filter_strength_mmx2() so it works with PAFF. fixed at least: CVFI1_Sony_D.jsv CVFI1_SVA_C.264 MR6_BT_B.h264
author michael
date Sat, 19 Jul 2008 21:53:54 +0000
parents af725308adf4
children b1003e468c3d
comparison
equal deleted inserted replaced
7326:fe8a7f5905e4 7327:483421b11d98
6493 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16)) 6493 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
6494 ? 3 : 0; 6494 ? 3 : 0;
6495 int step = IS_8x8DCT(mb_type) ? 2 : 1; 6495 int step = IS_8x8DCT(mb_type) ? 2 : 1;
6496 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; 6496 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
6497 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache, 6497 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
6498 (h->slice_type == FF_B_TYPE), edges, step, mask_edge0, mask_edge1 ); 6498 (h->slice_type == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
6499 } 6499 }
6500 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) ) 6500 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
6501 bSv[0][0] = 0x0004000400040004ULL; 6501 bSv[0][0] = 0x0004000400040004ULL;
6502 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) ) 6502 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
6503 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL; 6503 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;