diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-07 13:39:06 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-07 13:39:06 +0000 |
| commit | fd77a846b8e4e517dc95d362521ddf80efab3d2d (patch) | |
| tree | b0f742d3d44b4ce4436370ae03f5e8f085d6a12b /libmpcodecs | |
| parent | b2cc42bbe863e4a8742b80cb27634372183fdb45 (diff) | |
| download | mpv-fd77a846b8e4e517dc95d362521ddf80efab3d2d.tar.bz2 mpv-fd77a846b8e4e517dc95d362521ddf80efab3d2d.tar.xz | |
cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18622 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_yadif.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index d61906815b..6cccffe243 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -83,9 +83,9 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int ds uint8_t *prev= &p->ref[0][i][x + y*refs]; uint8_t *cur = &p->ref[1][i][x + y*refs]; uint8_t *next= &src[i][x + y*srcs]; - uint8_t *prev2= (tff ^ (y&1)) ? cur : prev; - uint8_t *next2= (tff ^ (y&1)) ? next : cur ; - int next2s= (tff ^ (y&1)) ? srcs : refs; + uint8_t *prev2= (tff ^ parity) ? prev : cur ; + uint8_t *next2= (tff ^ parity) ? cur : next; + int next2s= (tff ^ parity) ? refs : srcs; int temporal_diff0= ABS(prev2[0] - next2[0]); int temporal_diff1=( ABS(prev[-refs] - cur[-refs]) + ABS(prev[+refs] - cur[+refs]) )>>1; @@ -95,20 +95,12 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int ds int spatial_pred= 0; int spatial_score= 1<<30; int v= temporal_pred; -#if 0 -#define RANGE 8 - for(j=-RANGE; j<=RANGE; j++){ - int score= 0; - for(k=-ABS(j)-1; k<=ABS(j)+1; k++) - score+= ABS(cur[-refs+k+j] - cur[+refs+k-j]); -#else -#define RANGE 1 - for(j=-RANGE; j<=RANGE; j++){ + + for(j=-1; j<=1; j++){ int score= ABS(cur[-refs-1+j] - cur[+refs-1-j]) + ABS(cur[-refs +j] - cur[+refs -j]) + ABS(cur[-refs+1+j] - cur[+refs+1-j]) + ABS(j); -#endif if(score < spatial_score){ spatial_score= score; |