Mercurial > libavcodec.hg

comparison h264.c @ 5822:b49be74d387c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mix-up of values in r10690 (deblocking for PAFF). Patch by Martin Zlomek, martin d zlomek a email d cz
author cehoyos
date Mon, 15 Oct 2007 06:23:02 +0000
parents fb293531e983
children 18859ffa5705
comparison
equal deleted inserted replaced
5821:51918cb97f6f 5822:b49be74d387c
6441 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; 6441 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
6442 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache, 6442 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
6443 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 ); 6443 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 );
6444 } 6444 }
6445 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) ) 6445 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
6446 bSv[0][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL; 6446 bSv[0][0] = 0x0004000400040004ULL;
6447 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) ) 6447 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
6448 bSv[1][0] = 0x0004000400040004ULL; 6448 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
6449 6449
6450 #define FILTER(hv,dir,edge)\ 6450 #define FILTER(hv,dir,edge)\
6451 if(bSv[dir][edge]) {\ 6451 if(bSv[dir][edge]) {\
6452 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\ 6452 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\
6453 if(!(edge&1)) {\ 6453 if(!(edge&1)) {\