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
1d4ca032
Commit
1d4ca032
authored
Jun 19, 2014
by
Tim Kopp
Committed by
Gerrit Code Review
Jun 19, 2014
Browse files
Merge "Update running avg for VP9 denoiser"
parents
1580a88c
a4b7a713
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_denoiser.c
View file @
1d4ca032
...
...
@@ -20,9 +20,46 @@ int vp9_denoiser_filter() {
return
0
;
}
int
update_running_avg
(
uint8_t
*
mc_avg
,
int
mc_avg_stride
,
uint8_t
*
avg
,
int
avg_stride
,
uint8_t
*
sig
,
int
sig_stride
,
BLOCK_SIZE
bs
)
{
// Indices: 0, 1, 2, 3, 4, 5 ,6, 7,
static
const
uint8_t
adjustments
[]
=
{
0
,
0
,
0
,
0
,
3
,
3
,
3
,
3
,
// 8, 9,10,11,12,13,14,15,16
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
6
};
int
r
,
c
;
int
diff
;
int
adjustment
;
int
total_adj
=
0
;
for
(
r
=
0
;
r
<
heights
[
bs
];
++
r
)
{
for
(
c
=
0
;
c
<
widths
[
bs
];
++
c
)
{
diff
=
mc_avg
[
c
]
-
sig
[
c
];
adjustment
=
adjustments
[
MIN
(
abs
(
diff
),
16
)];
if
(
diff
>
0
)
{
avg
[
c
]
=
MIN
(
UINT8_MAX
,
sig
[
c
]
+
adjustment
);
total_adj
+=
adjustment
;
}
else
{
avg
[
c
]
=
MAX
(
0
,
sig
[
c
]
-
adjustment
);
total_adj
-=
adjustment
;
}
}
sig
+=
sig_stride
;
avg
+=
avg_stride
;
mc_avg
+=
mc_avg_stride
;
}
return
total_adj
;
}
void
vp9_denoiser_denoise
(
VP9_DENOISER
*
denoiser
,
MACROBLOCK
*
mb
,
MODE_INFO
**
grid
,
int
mi_row
,
int
mi_col
,
BLOCK_SIZE
bs
)
{
update_running_avg
(
denoiser
->
mc_running_avg_y
.
buf
,
denoiser
->
mc_running_avg_y
.
stride
,
denoiser
->
running_avg_y
.
buf
,
denoiser
->
running_avg_y
.
stride
,
mb
->
plane
[
0
].
src
.
buf
,
mb
->
plane
[
0
].
src
.
stride
,
bs
);
return
;
}
...
...
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