Mercurial > libavcodec.hg

comparison snow.c @ 4197:bbe0bc387a19 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert bad checkin
author mru
date Tue, 14 Nov 2006 03:18:09 +0000
parents fbac0859753d
children d6f83e2f8804
comparison
equal deleted inserted replaced
4196:fbac0859753d 4197:bbe0bc387a19
2999 /* FIXME cmps overlap but don't cover the wavelet's whole support, 2999 /* FIXME cmps overlap but don't cover the wavelet's whole support,
3000 * so improving the score of one block is not strictly guaranteed to 3000 * so improving the score of one block is not strictly guaranteed to
3001 * improve the score of the whole frame, so iterative motion est 3001 * improve the score of the whole frame, so iterative motion est
3002 * doesn't always converge. */ 3002 * doesn't always converge. */
3003 if(s->avctx->me_cmp == FF_CMP_W97) 3003 if(s->avctx->me_cmp == FF_CMP_W97)
3004 distortion = ff_w97_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32); 3004 distortion = w97_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
3005 else if(s->avctx->me_cmp == FF_CMP_W53) 3005 else if(s->avctx->me_cmp == FF_CMP_W53)
3006 distortion = ff_w53_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32); 3006 distortion = w53_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
3007 else{ 3007 else{
3008 distortion = 0; 3008 distortion = 0;
3009 for(i=0; i<4; i++){ 3009 for(i=0; i<4; i++){
3010 int off = sx+16*(i&1) + (sy+16*(i>>1))*ref_stride; 3010 int off = sx+16*(i&1) + (sy+16*(i>>1))*ref_stride;
3011 distortion += s->dsp.me_cmp[0](&s->m, src + off, dst + off, ref_stride, 16); 3011 distortion += s->dsp.me_cmp[0](&s->m, src + off, dst + off, ref_stride, 16);