Skip to content
GitLab
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
28dfb162
Commit
28dfb162
authored
May 13, 2014
by
Adrian Grange
Committed by
Gerrit Code Review
May 13, 2014
Browse files
Merge "vp9_convolve.c: cleanup -wextra warnings"
parents
9e311a53
fd6bf31b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_convolve.c
View file @
28dfb162
...
...
@@ -156,6 +156,9 @@ void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride,
const
InterpKernel
*
const
filters_x
=
get_filter_base
(
filter_x
);
const
int
x0_q4
=
get_filter_offset
(
filter_x
,
filters_x
);
(
void
)
filter_y
;
(
void
)
y_step_q4
;
convolve_horiz
(
src
,
src_stride
,
dst
,
dst_stride
,
filters_x
,
x0_q4
,
x_step_q4
,
w
,
h
);
}
...
...
@@ -168,6 +171,9 @@ void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride,
const
InterpKernel
*
const
filters_x
=
get_filter_base
(
filter_x
);
const
int
x0_q4
=
get_filter_offset
(
filter_x
,
filters_x
);
(
void
)
filter_y
;
(
void
)
y_step_q4
;
convolve_avg_horiz
(
src
,
src_stride
,
dst
,
dst_stride
,
filters_x
,
x0_q4
,
x_step_q4
,
w
,
h
);
}
...
...
@@ -179,6 +185,10 @@ void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride,
int
w
,
int
h
)
{
const
InterpKernel
*
const
filters_y
=
get_filter_base
(
filter_y
);
const
int
y0_q4
=
get_filter_offset
(
filter_y
,
filters_y
);
(
void
)
filter_x
;
(
void
)
x_step_q4
;
convolve_vert
(
src
,
src_stride
,
dst
,
dst_stride
,
filters_y
,
y0_q4
,
y_step_q4
,
w
,
h
);
}
...
...
@@ -190,6 +200,10 @@ void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride,
int
w
,
int
h
)
{
const
InterpKernel
*
const
filters_y
=
get_filter_base
(
filter_y
);
const
int
y0_q4
=
get_filter_offset
(
filter_y
,
filters_y
);
(
void
)
filter_x
;
(
void
)
x_step_q4
;
convolve_avg_vert
(
src
,
src_stride
,
dst
,
dst_stride
,
filters_y
,
y0_q4
,
y_step_q4
,
w
,
h
);
}
...
...
@@ -232,6 +246,9 @@ void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride,
int
w
,
int
h
)
{
int
r
;
(
void
)
filter_x
;
(
void
)
filter_x_stride
;
(
void
)
filter_y
;
(
void
)
filter_y_stride
;
for
(
r
=
h
;
r
>
0
;
--
r
)
{
vpx_memcpy
(
dst
,
src
,
w
);
src
+=
src_stride
;
...
...
@@ -246,6 +263,9 @@ void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride,
int
w
,
int
h
)
{
int
x
,
y
;
(
void
)
filter_x
;
(
void
)
filter_x_stride
;
(
void
)
filter_y
;
(
void
)
filter_y_stride
;
for
(
y
=
0
;
y
<
h
;
++
y
)
{
for
(
x
=
0
;
x
<
w
;
++
x
)
dst
[
x
]
=
ROUND_POWER_OF_TWO
(
dst
[
x
]
+
src
[
x
],
1
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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