comparison h264_loopfilter.c @ 11036:faedf5cdb8c3 libavcodec

Simplify first edge filter condition.
author michael
date Thu, 28 Jan 2010 02:41:52 +0000
parents 4debec8a15fa
children dfc8f928cc8a
comparison
equal deleted inserted replaced
11035:4debec8a15fa 11036:faedf5cdb8c3
438 const int edges = mask_edge== 3 && !(h->cbp&15) ? 1 : 4; 438 const int edges = mask_edge== 3 && !(h->cbp&15) ? 1 : 4;
439 439
440 // how often to recheck mv-based bS when iterating along each edge 440 // how often to recheck mv-based bS when iterating along each edge
441 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); 441 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
442 442
443 if(!(h->slice_table[mbm_xy] == 0xFFFF 443 if(mbm_type && !first_vertical_edge_done){
444 || first_vertical_edge_done
445 || (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_num))){
446 444
447 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) 445 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0)
448 && IS_INTERLACED(mbm_type&~mb_type) 446 && IS_INTERLACED(mbm_type&~mb_type)
449 ) { 447 ) {
450 // This is a special case in the norm where the filtering must 448 // This is a special case in the norm where the filtering must