Commit 7fed3832 authored by Johann's avatar Johann
Browse files

Remove dead code

The new loopfilter was originally introduced as an experimental change.
It's permanent now.

Change-Id: I25dbedb6ceff3e9f9c04e18bb29f84c3ecb7e546
parent cdd20666
......@@ -13,9 +13,6 @@
#include "loopfilter.h"
#include "onyxc_int.h"
#define NEW_LOOPFILTER_MASK
typedef unsigned char uc;
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(q2 - q1) > 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;
#endif
mask = ~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?
// error C2143: syntax error : missing ';' before 'type'
// (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;
#endif
return mask;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment