Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
ffc6aeef
Commit
ffc6aeef
authored
Feb 04, 2011
by
Gaute Strokkenes
Browse files
Remove duplicate loopfilter parameters.
Change-Id: I0d41415e3961c2c9492d342290c1999f9d02e6d8
parent
bf5f585b
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp8/common/arm/loopfilter_arm.c
View file @
ffc6aeef
...
...
@@ -41,13 +41,13 @@ void vp8_loop_filter_mbh_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsig
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_horizontal_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_horizontal_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_horizontal_edge_armv6
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_armv6
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_horizontal_edge_armv6
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_armv6
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_mbhs_armv6
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -57,7 +57,7 @@ void vp8_loop_filter_mbhs_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsi
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_horizontal_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_horizontal_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Vertical MB Filtering */
...
...
@@ -65,13 +65,13 @@ void vp8_loop_filter_mbv_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsig
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_vertical_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_vertical_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_vertical_edge_armv6
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_armv6
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_vertical_edge_armv6
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_armv6
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_mbvs_armv6
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -81,7 +81,7 @@ void vp8_loop_filter_mbvs_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsi
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_vertical_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_vertical_edge_armv6
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Horizontal B Filtering */
...
...
@@ -94,10 +94,10 @@ void vp8_loop_filter_bh_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsign
vp8_loop_filter_horizontal_edge_armv6
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_horizontal_edge_armv6
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_armv6
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_horizontal_edge_armv6
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_armv6
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_bhs_armv6
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -122,10 +122,10 @@ void vp8_loop_filter_bv_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsign
vp8_loop_filter_vertical_edge_armv6
(
y_ptr
+
12
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_vertical_edge_armv6
(
u_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_armv6
(
u_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_vertical_edge_armv6
(
v_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_armv6
(
v_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_bvs_armv6
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -148,10 +148,10 @@ void vp8_loop_filter_mbh_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsign
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_horizontal_edge_y_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_horizontal_edge_y_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_horizontal_edge_uv_neon
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
v_ptr
);
vp8_mbloop_filter_horizontal_edge_uv_neon
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
);
}
void
vp8_loop_filter_mbhs_neon
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -161,7 +161,7 @@ void vp8_loop_filter_mbhs_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsig
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_horizontal_edge_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_horizontal_edge_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Vertical MB Filtering */
...
...
@@ -169,10 +169,10 @@ void vp8_loop_filter_mbv_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsign
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_vertical_edge_y_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_vertical_edge_y_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_vertical_edge_uv_neon
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
v_ptr
);
vp8_mbloop_filter_vertical_edge_uv_neon
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
);
}
void
vp8_loop_filter_mbvs_neon
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -182,7 +182,7 @@ void vp8_loop_filter_mbvs_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsig
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_vertical_edge_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_vertical_edge_neon
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Horizontal B Filtering */
...
...
@@ -195,7 +195,7 @@ void vp8_loop_filter_bh_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
vp8_loop_filter_horizontal_edge_y_neon
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_horizontal_edge_uv_neon
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
v_ptr
+
4
*
uv_stride
);
vp8_loop_filter_horizontal_edge_uv_neon
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
+
4
*
uv_stride
);
}
void
vp8_loop_filter_bhs_neon
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -220,7 +220,7 @@ void vp8_loop_filter_bv_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
vp8_loop_filter_vertical_edge_y_neon
(
y_ptr
+
12
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_vertical_edge_uv_neon
(
u_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
v_ptr
+
4
);
vp8_loop_filter_vertical_edge_uv_neon
(
u_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
+
4
);
}
void
vp8_loop_filter_bvs_neon
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
vp8/common/loopfilter.c
View file @
ffc6aeef
...
...
@@ -28,13 +28,13 @@ void vp8_loop_filter_mbh_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_horizontal_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_horizontal_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_horizontal_edge_c
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_c
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_horizontal_edge_c
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_c
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_mbhs_c
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -44,7 +44,7 @@ void vp8_loop_filter_mbhs_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_horizontal_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_horizontal_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Vertical MB Filtering */
...
...
@@ -52,13 +52,13 @@ void vp8_loop_filter_mbv_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_vertical_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_vertical_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_vertical_edge_c
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_c
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_vertical_edge_c
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_c
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_mbvs_c
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -68,7 +68,7 @@ void vp8_loop_filter_mbvs_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_vertical_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_vertical_edge_c
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
/* Horizontal B Filtering */
...
...
@@ -81,10 +81,10 @@ void vp8_loop_filter_bh_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned c
vp8_loop_filter_horizontal_edge_c
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_horizontal_edge_c
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_c
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_horizontal_edge_c
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_c
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_bhs_c
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -109,10 +109,10 @@ void vp8_loop_filter_bv_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned c
vp8_loop_filter_vertical_edge_c
(
y_ptr
+
12
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_vertical_edge_c
(
u_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_c
(
u_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_vertical_edge_c
(
v_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_c
(
v_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
void
vp8_loop_filter_bvs_c
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -137,8 +137,6 @@ void vp8_init_loop_filter(VP8_COMMON *cm)
int
block_inside_limit
=
0
;
int
HEVThresh
;
const
int
yhedge_boost
=
2
;
const
int
uvhedge_boost
=
2
;
/* For each possible value for the loop filter fill out a "loop_filter_info" entry. */
for
(
i
=
0
;
i
<=
MAX_LOOP_FILTER
;
i
++
)
...
...
@@ -182,15 +180,9 @@ void vp8_init_loop_filter(VP8_COMMON *cm)
for
(
j
=
0
;
j
<
16
;
j
++
)
{
lfi
[
i
].
lim
[
j
]
=
block_inside_limit
;
lfi
[
i
].
mbflim
[
j
]
=
filt_lvl
+
yhedge_boost
;
lfi
[
i
].
mbthr
[
j
]
=
HEVThresh
;
lfi
[
i
].
mbflim
[
j
]
=
filt_lvl
+
2
;
lfi
[
i
].
flim
[
j
]
=
filt_lvl
;
lfi
[
i
].
thr
[
j
]
=
HEVThresh
;
lfi
[
i
].
uvlim
[
j
]
=
block_inside_limit
;
lfi
[
i
].
uvmbflim
[
j
]
=
filt_lvl
+
uvhedge_boost
;
lfi
[
i
].
uvmbthr
[
j
]
=
HEVThresh
;
lfi
[
i
].
uvflim
[
j
]
=
filt_lvl
;
lfi
[
i
].
uvthr
[
j
]
=
HEVThresh
;
}
}
...
...
@@ -249,15 +241,9 @@ void vp8_frame_init_loop_filter(loop_filter_info *lfi, int frame_type)
for
(
j
=
0
;
j
<
16
;
j
++
)
{
/*lfi[i].lim[j] = block_inside_limit;
lfi[i].mbflim[j] = filt_lvl+yhedge_boost;*/
lfi
[
i
].
mbthr
[
j
]
=
HEVThresh
;
lfi[i].mbflim[j] = filt_lvl+2;*/
/*lfi[i].flim[j] = filt_lvl;*/
lfi
[
i
].
thr
[
j
]
=
HEVThresh
;
/*lfi[i].uvlim[j] = block_inside_limit;
lfi[i].uvmbflim[j] = filt_lvl+uvhedge_boost;*/
lfi
[
i
].
uvmbthr
[
j
]
=
HEVThresh
;
/*lfi[i].uvflim[j] = filt_lvl;*/
lfi
[
i
].
uvthr
[
j
]
=
HEVThresh
;
}
}
}
...
...
vp8/common/loopfilter.h
View file @
ffc6aeef
...
...
@@ -32,12 +32,6 @@ typedef struct
DECLARE_ALIGNED
(
16
,
signed
char
,
flim
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
thr
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
mbflim
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
mbthr
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
uvlim
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
uvflim
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
uvthr
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
uvmbflim
[
16
]);
DECLARE_ALIGNED
(
16
,
signed
char
,
uvmbthr
[
16
]);
}
loop_filter_info
;
...
...
vp8/common/ppc/loopfilter_altivec.c
View file @
ffc6aeef
...
...
@@ -56,10 +56,10 @@ void loop_filter_mbh_ppc(unsigned char *y_ptr, unsigned char *u_ptr, unsigned ch
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
mbloop_filter_horizontal_edge_y_ppc
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
);
mbloop_filter_horizontal_edge_y_ppc
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
);
if
(
u_ptr
)
mbloop_filter_horizontal_edge_uv_ppc
(
u_ptr
,
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
);
mbloop_filter_horizontal_edge_uv_ppc
(
u_ptr
,
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
);
}
void
loop_filter_mbhs_ppc
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -77,10 +77,10 @@ void loop_filter_mbv_ppc(unsigned char *y_ptr, unsigned char *u_ptr, unsigned ch
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
mbloop_filter_vertical_edge_y_ppc
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
);
mbloop_filter_vertical_edge_y_ppc
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
);
if
(
u_ptr
)
mbloop_filter_vertical_edge_uv_ppc
(
u_ptr
,
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
);
mbloop_filter_vertical_edge_uv_ppc
(
u_ptr
,
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
);
}
void
loop_filter_mbvs_ppc
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -104,7 +104,7 @@ void loop_filter_bh_ppc(unsigned char *y_ptr, unsigned char *u_ptr, unsigned cha
loop_filter_horizontal_edge_y_ppc
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
);
if
(
u_ptr
)
loop_filter_horizontal_edge_uv_ppc
(
u_ptr
+
4
*
uv_stride
,
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
);
loop_filter_horizontal_edge_uv_ppc
(
u_ptr
+
4
*
uv_stride
,
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
);
}
void
loop_filter_bhs_ppc
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
@@ -127,7 +127,7 @@ void loop_filter_bv_ppc(unsigned char *y_ptr, unsigned char *u_ptr, unsigned cha
loop_filter_vertical_edge_y_ppc
(
y_ptr
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
);
if
(
u_ptr
)
loop_filter_vertical_edge_uv_ppc
(
u_ptr
+
4
,
v_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
);
loop_filter_vertical_edge_uv_ppc
(
u_ptr
+
4
,
v_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
);
}
void
loop_filter_bvs_ppc
(
unsigned
char
*
y_ptr
,
unsigned
char
*
u_ptr
,
unsigned
char
*
v_ptr
,
...
...
vp8/common/x86/loopfilter_x86.c
View file @
ffc6aeef
...
...
@@ -45,13 +45,13 @@ void vp8_loop_filter_mbh_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_horizontal_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_horizontal_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_horizontal_edge_mmx
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_mmx
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_horizontal_edge_mmx
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_horizontal_edge_mmx
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
...
...
@@ -62,7 +62,7 @@ void vp8_loop_filter_mbhs_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsign
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_horizontal_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_horizontal_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
...
...
@@ -71,13 +71,13 @@ void vp8_loop_filter_mbv_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_vertical_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_vertical_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_vertical_edge_mmx
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_mmx
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_mbloop_filter_vertical_edge_mmx
(
v_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
1
);
vp8_mbloop_filter_vertical_edge_mmx
(
v_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
...
...
@@ -88,7 +88,7 @@ void vp8_loop_filter_mbvs_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsign
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_vertical_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_vertical_edge_mmx
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
...
...
@@ -102,10 +102,10 @@ void vp8_loop_filter_bh_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
vp8_loop_filter_horizontal_edge_mmx
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_horizontal_edge_mmx
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_mmx
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_horizontal_edge_mmx
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_horizontal_edge_mmx
(
v_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
...
...
@@ -132,10 +132,10 @@ void vp8_loop_filter_bv_mmx(unsigned char *y_ptr, unsigned char *u_ptr, unsigned
vp8_loop_filter_vertical_edge_mmx
(
y_ptr
+
12
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_vertical_edge_mmx
(
u_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_mmx
(
u_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
if
(
v_ptr
)
vp8_loop_filter_vertical_edge_mmx
(
v_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
1
);
vp8_loop_filter_vertical_edge_mmx
(
v_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
1
);
}
...
...
@@ -159,10 +159,10 @@ void vp8_loop_filter_mbh_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsign
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_horizontal_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_horizontal_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_horizontal_edge_uv_sse2
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
v_ptr
);
vp8_mbloop_filter_horizontal_edge_uv_sse2
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
);
}
...
...
@@ -173,7 +173,7 @@ void vp8_loop_filter_mbhs_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsig
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_horizontal_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_horizontal_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
...
...
@@ -182,10 +182,10 @@ void vp8_loop_filter_mbv_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsign
int
y_stride
,
int
uv_stride
,
loop_filter_info
*
lfi
,
int
simpler_lpf
)
{
(
void
)
simpler_lpf
;
vp8_mbloop_filter_vertical_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_mbloop_filter_vertical_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_mbloop_filter_vertical_edge_uv_sse2
(
u_ptr
,
uv_stride
,
lfi
->
uv
mbflim
,
lfi
->
uv
lim
,
lfi
->
uvmb
thr
,
v_ptr
);
vp8_mbloop_filter_vertical_edge_uv_sse2
(
u_ptr
,
uv_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
);
}
...
...
@@ -196,7 +196,7 @@ void vp8_loop_filter_mbvs_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsig
(
void
)
v_ptr
;
(
void
)
uv_stride
;
(
void
)
simpler_lpf
;
vp8_loop_filter_simple_vertical_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
mb
thr
,
2
);
vp8_loop_filter_simple_vertical_edge_sse2
(
y_ptr
,
y_stride
,
lfi
->
mbflim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
}
...
...
@@ -210,7 +210,7 @@ void vp8_loop_filter_bh_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
vp8_loop_filter_horizontal_edge_sse2
(
y_ptr
+
12
*
y_stride
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_horizontal_edge_uv_sse2
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
v_ptr
+
4
*
uv_stride
);
vp8_loop_filter_horizontal_edge_uv_sse2
(
u_ptr
+
4
*
uv_stride
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
+
4
*
uv_stride
);
}
...
...
@@ -237,7 +237,7 @@ void vp8_loop_filter_bv_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsigne
vp8_loop_filter_vertical_edge_sse2
(
y_ptr
+
12
,
y_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
2
);
if
(
u_ptr
)
vp8_loop_filter_vertical_edge_uv_sse2
(
u_ptr
+
4
,
uv_stride
,
lfi
->
uv
flim
,
lfi
->
uv
lim
,
lfi
->
uv
thr
,
v_ptr
+
4
);
vp8_loop_filter_vertical_edge_uv_sse2
(
u_ptr
+
4
,
uv_stride
,
lfi
->
flim
,
lfi
->
lim
,
lfi
->
thr
,
v_ptr
+
4
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment