Mercurial > libavcodec.hg
diff dsputil.c @ 2066:4bfb146e701b libavcodec
nsse weight
| author | michael |
|---|---|
| date | Mon, 07 Jun 2004 17:30:02 +0000 |
| parents | 9e4bebc39ade |
| children | db8baace74d8 |
line wrap: on
line diff
--- a/dsputil.c Mon Jun 07 03:23:31 2004 +0000 +++ b/dsputil.c Mon Jun 07 17:30:02 2004 +0000 @@ -2587,11 +2587,11 @@ return s; } -static int nsse16_c(/*MpegEncContext*/ void *c, uint8_t *s1, uint8_t *s2, int stride, int h){ +static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ int score1=0; int score2=0; int x,y; - + for(y=0; y<h; y++){ for(x=0; x<16; x++){ score1+= (s1[x ] - s2[x ])*(s1[x ] - s2[x ]); @@ -2607,11 +2607,12 @@ s1+= stride; s2+= stride; } - - return score1 + ABS(score2)*8; + + if(c) return score1 + ABS(score2)*c->avctx->nsse_weight; + else return score1 + ABS(score2)*8; } -static int nsse8_c(/*MpegEncContext*/ void *c, uint8_t *s1, uint8_t *s2, int stride, int h){ +static int nsse8_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ int score1=0; int score2=0; int x,y; @@ -2632,7 +2633,8 @@ s2+= stride; } - return score1 + ABS(score2)*8; + if(c) return score1 + ABS(score2)*c->avctx->nsse_weight; + else return score1 + ABS(score2)*8; } static int try_8x8basis_c(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale){