Mercurial > libavcodec.hg
changeset 7485:e6c14a62db74 libavcodec
Port col_parity code from spatial mode to temporal mode,
I also love it if people duplicate code and fix one but not the other.
| author | michael |
|---|---|
| date | Mon, 04 Aug 2008 23:06:45 +0000 |
| parents | 74f16dd7abc6 |
| children | a52ba8daad18 |
| files | h264.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Mon Aug 04 22:59:53 2008 +0000 +++ b/h264.c Mon Aug 04 23:06:45 2008 +0000 @@ -1185,12 +1185,12 @@ else *mb_type |= MB_TYPE_8x8; }else{ - /* field to frame scaling */ - /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1) - * but in MBAFF, top and bottom POC are equal */ - int dy = (s->mb_y&1) ? 1 : 2; + int cur_poc = s->current_picture_ptr->poc; + int *col_poc = h->ref_list[1]->field_poc; + int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc); + int dy = 2*col_parity - (s->mb_y&1); mb_types_col[0] = - mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; + mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy + col_parity*s->mb_stride]; l1ref0 += dy*h->b8_stride; l1ref1 += dy*h->b8_stride; l1mv0 += 2*dy*h->b_stride;