Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
1b672d3f
Commit
1b672d3f
authored
Feb 14, 2017
by
Zoe Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make convolve_round compiled without dual_filter
Change-Id: I532e46b3947ca3f5898a2da61fb6b82c2f4bd5c6
parent
1ba9bd89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
av1/common/convolve.c
av1/common/convolve.c
+3
-0
av1/common/reconinter.h
av1/common/reconinter.h
+6
-2
No files found.
av1/common/convolve.c
View file @
1b672d3f
...
...
@@ -284,12 +284,15 @@ void av1_convolve_2d_facade(const uint8_t *src, int src_stride, uint8_t *dst,
av1_get_interp_filter_params
(
interp_filter
[
1
+
2
*
conv_params
->
ref
]);
InterpFilterParams
filter_params_y
=
av1_get_interp_filter_params
(
interp_filter
[
0
+
2
*
conv_params
->
ref
]);
#if CONFIG_DUAL_FILTER
if
(
filter_params_x
.
interp_filter
==
MULTITAP_SHARP
&&
filter_params_y
.
interp_filter
==
MULTITAP_SHARP
)
{
// Avoid two directions both using 12-tap filter.
// This will reduce hardware implementation cost.
filter_params_y
=
av1_get_interp_filter_params
(
EIGHTTAP_SHARP
);
}
#endif
if
(
filter_params_y
.
taps
<
filter_params_x
.
taps
)
{
uint8_t
tr_src
[(
MAX_SB_SIZE
+
MAX_FILTER_TAP
-
1
)
*
...
...
av1/common/reconinter.h
View file @
1b672d3f
...
...
@@ -74,8 +74,12 @@ static INLINE void inter_predictor(const uint8_t *src, int src_stride,
#if CONFIG_CONVOLVE_ROUND
if
(
conv_params
->
round
==
CONVOLVE_OPT_NO_ROUND
)
av1_convolve_2d_facade
(
src
,
src_stride
,
dst
,
dst_stride
,
w
,
h
,
interp_filter
,
subpel_x
,
xs
,
subpel_y
,
ys
,
conv_params
);
#if CONFIG_DUAL_FILTER
interp_filter
,
#else
&
interp_filter
,
#endif
subpel_x
,
xs
,
subpel_y
,
ys
,
conv_params
);
else
#endif
av1_convolve
(
src
,
src_stride
,
dst
,
dst_stride
,
w
,
h
,
interp_filter
,
...
...
Write
Preview
Markdown
is supported
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