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
1a66dab9
Commit
1a66dab9
authored
Jun 18, 2014
by
Tim Kopp
Browse files
VP9 denoiser used s/int/enum where appropriate
Change-Id: Id52a7869fd1f31bb060de170e3295da7435adb9e
parent
2f71de77
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_denoiser.c
View file @
1a66dab9
...
...
@@ -22,14 +22,13 @@ static void make_grayscale(YV12_BUFFER_CONFIG *yuv);
static
const
int
widths
[]
=
{
4
,
4
,
8
,
8
,
8
,
16
,
16
,
16
,
32
,
32
,
32
,
64
,
64
};
static
const
int
heights
[]
=
{
4
,
8
,
4
,
8
,
16
,
8
,
16
,
32
,
16
,
32
,
64
,
32
,
64
};
int
vp9_denoiser_filter
()
{
return
0
;
}
static
int
update_running_avg
(
const
uint8_t
*
mc_avg
,
int
mc_avg_stride
,
uint8_t
*
avg
,
int
avg_stride
,
const
uint8_t
*
sig
,
int
sig_stride
,
int
increase_denoising
,
BLOCK_SIZE
bs
)
{
static
VP9_DENOISER_DECISION
update_running_avg
(
const
uint8_t
*
mc_avg
,
int
mc_avg_stride
,
uint8_t
*
avg
,
int
avg_stride
,
const
uint8_t
*
sig
,
int
sig_stride
,
int
increase_denoising
,
BLOCK_SIZE
bs
)
{
int
r
,
c
;
int
diff
,
adj
,
absdiff
;
int
shift_inc1
=
0
,
shift_inc2
=
1
;
...
...
@@ -94,9 +93,12 @@ void copy_block(uint8_t *dest, int dest_stride,
}
}
static
int
perform_motion_compensation
(
VP9_DENOISER
*
denoiser
,
MACROBLOCK
*
mb
,
BLOCK_SIZE
bs
,
int
increase_denoising
,
int
mi_row
,
int
mi_col
)
{
static
VP9_DENOISER_DECISION
perform_motion_compensation
(
VP9_DENOISER
*
denoiser
,
MACROBLOCK
*
mb
,
BLOCK_SIZE
bs
,
int
increase_denoising
,
int
mi_row
,
int
mi_col
)
{
// constants
// TODO(tkopp): empirically determine good constants, or functions of block
// size.
...
...
@@ -228,7 +230,7 @@ static int perform_motion_compensation(VP9_DENOISER *denoiser, MACROBLOCK *mb,
void
vp9_denoiser_denoise
(
VP9_DENOISER
*
denoiser
,
MACROBLOCK
*
mb
,
int
mi_row
,
int
mi_col
,
BLOCK_SIZE
bs
)
{
int
decision
=
COPY
_BLOCK
;
VP9_DENOISER_DECISION
decision
=
FILTER
_BLOCK
;
YV12_BUFFER_CONFIG
avg
=
denoiser
->
running_avg_y
[
INTRA_FRAME
];
YV12_BUFFER_CONFIG
mc_avg
=
denoiser
->
mc_running_avg_y
;
...
...
vp9/encoder/vp9_denoiser.h
View file @
1a66dab9
...
...
@@ -18,10 +18,10 @@
extern
"C"
{
#endif
enum
vp9_denoiser_decision
{
typedef
enum
vp9_denoiser_decision
{
COPY_BLOCK
,
FILTER_BLOCK
};
}
VP9_DENOISER_DECISION
;
typedef
struct
vp9_denoiser
{
YV12_BUFFER_CONFIG
running_avg_y
[
MAX_REF_FRAMES
];
...
...
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