generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'internal/upstream' into HEAD

Browse Source
This commit is contained in:
John Koleszar 2010-09-23 00:05:10 -04:00
commit fbd3db91bb
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp8/common/loopfilter_filters.c
View File

@ -13,9 +13,6 @@
#include "loopfilter.h" #include "loopfilter.h"
#include "onyxc_int.h" #include "onyxc_int.h"
#define NEW_LOOPFILTER_MASK
typedef unsigned char uc; typedef unsigned char uc;
static __inline signed char vp8_signed_char_clamp(int t) static __inline signed char vp8_signed_char_clamp(int t)
@ -37,11 +34,7 @@ static __inline signed char vp8_filter_mask(signed char limit, signed char flimi
mask |= (abs(q1 - q0) > limit) * -1; mask |= (abs(q1 - q0) > limit) * -1;
mask |= (abs(q2 - q1) > limit) * -1; mask |= (abs(q2 - q1) > limit) * -1;
mask |= (abs(q3 - q2) > limit) * -1; mask |= (abs(q3 - q2) > limit) * -1;
#ifndef NEW_LOOPFILTER_MASK
mask |= (abs(p0 - q0) > flimit) * -1;
#else
mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > flimit * 2 + limit) * -1; mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > flimit * 2 + limit) * -1;
#endif
mask = ~mask; mask = ~mask;
return mask; return mask;
} }
@ -286,11 +279,7 @@ static __inline signed char vp8_simple_filter_mask(signed char limit, signed cha
// Why does this cause problems for win32? // Why does this cause problems for win32?
// error C2143: syntax error : missing ';' before 'type' // error C2143: syntax error : missing ';' before 'type'
// (void) limit; // (void) limit;
#ifndef NEW_LOOPFILTER_MASK
signed char mask = (abs(p0 - q0) <= flimit) * -1;
#else
signed char mask = (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 <= flimit * 2 + limit) * -1; signed char mask = (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 <= flimit * 2 + limit) * -1;
#endif
return mask; return mask;
} }