Mercurial > libavcodec.hg
changeset 2200:733c60a6e30c libavcodec
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
| author | michael |
|---|---|
| date | Thu, 02 Sep 2004 10:49:54 +0000 |
| parents | e0b08bdf565d |
| children | ccff80bb955f |
| files | h264.c |
| diffstat | 1 files changed, 22 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Tue Aug 31 16:28:49 2004 +0000 +++ b/h264.c Thu Sep 02 10:49:54 2004 +0000 @@ -2321,6 +2321,8 @@ MpegEncContext * const s = &h->s; int temp8, i; uint64_t temp64; + int deblock_left = (s->mb_x > 0); + int deblock_top = (s->mb_y > 0); src_y -= linesize + 1; src_cb -= uvlinesize + 1; @@ -2331,21 +2333,29 @@ if(xchg)\ a= b;\ b= t; - - for(i=0; i<17; i++){ - XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); - } - - XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); - XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); + + if(deblock_left){ + for(i = !deblock_top; i<17; i++){ + XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); + } + } + + if(deblock_top){ + XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); + XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); + } if(!(s->flags&CODEC_FLAG_GRAY)){ - for(i=0; i<9; i++){ - XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg); - XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg); + if(deblock_left){ + for(i = !deblock_top; i<9; i++){ + XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg); + XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg); + } } - XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); - XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); + if(deblock_top){ + XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); + XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); + } } }