Mercurial > libavcodec.hg
changeset 2629:202cd69d8d2e libavcodec
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
| author | lorenm |
|---|---|
| date | Sun, 24 Apr 2005 21:06:22 +0000 |
| parents | 511e3afc43e1 |
| children | 026c1600b532 |
| files | h264.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Sun Apr 24 17:21:11 2005 +0000 +++ b/h264.c Sun Apr 24 21:06:22 2005 +0000 @@ -6079,6 +6079,10 @@ const int mb_xy= mb_x + mb_y*s->mb_stride; int first_vertical_edge_done = 0; int dir; + /* FIXME: A given frame may occupy more than one position in + * the reference list. So ref2frm should be populated with + * frame numbers, not indices. */ + static const int ref2frm[18] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; if (h->mb_aff_frame // left mb is in picture @@ -6110,13 +6114,10 @@ h->non_zero_count_cache[bn_idx] != 0 ) { bS[i] = 2; } else { - /* FIXME: A given frame may occupy more than one position in - * the reference list. So we should compare the frame numbers, - * not the indices in the ref list. */ int l; bS[i] = 0; for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { - if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] || + if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { bS[i] = 1; @@ -6249,13 +6250,10 @@ } else { - /* FIXME: A given frame may occupy more than one position in - * the reference list. So we should compare the frame numbers, - * not the indices in the ref list. */ int l; bS[i] = 0; for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { - if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] || + if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { bS[i] = 1;