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
95fef214
Commit
95fef214
authored
Jul 19, 2016
by
James Zern
Committed by
Gerrit Code Review
Jul 19, 2016
Browse files
Merge "fix vp10_convolve() signatures" into nextgenv2
parents
096d8ace
87c2db82
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp10/common/vp10_convolve.c
View file @
95fef214
...
...
@@ -102,8 +102,8 @@ void vp10_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
#else
const
INTERP_FILTER
interp_filter
,
#endif
const
int
subpel_x_q4
,
int
x_step_q4
,
const
int
subpel_y_q4
,
int
y_step_q4
,
int
ref_idx
)
{
const
int
subpel_x_q4
,
int
x_step_q4
,
const
int
subpel_y_q4
,
int
y_step_q4
,
int
ref_idx
)
{
int
ignore_horiz
=
x_step_q4
==
16
&&
subpel_x_q4
==
0
;
int
ignore_vert
=
y_step_q4
==
16
&&
subpel_y_q4
==
0
;
...
...
vp10/common/vp10_convolve.h
View file @
95fef214
...
...
@@ -14,9 +14,8 @@ void vp10_convolve(const uint8_t *src, int src_stride,
#else
const
INTERP_FILTER
interp_filter
,
#endif
const
int
subpel_x
,
const
int
subpel_y
,
int
xstep
,
int
ystep
,
int
avg
);
const
int
subpel_x
,
int
xstep
,
const
int
subpel_y
,
int
ystep
,
int
avg
);
#if CONFIG_VP9_HIGHBITDEPTH
void
vp10_highbd_convolve
(
const
uint8_t
*
src
,
int
src_stride
,
...
...
@@ -27,9 +26,9 @@ void vp10_highbd_convolve(const uint8_t *src, int src_stride,
#else
const
INTERP_FILTER
interp_filter
,
#endif
const
int
subpel_x
,
const
int
subpel_y
,
int
xstep
,
int
ystep
,
int
avg
,
int
bd
);
const
int
subpel_x
,
int
xstep
,
const
int
subpel_y
,
int
ystep
,
int
avg
,
int
bd
);
#endif // CONFIG_VP9_HIGHBITDEPTH
#ifdef __cplusplus
...
...
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