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
12084f6d
Commit
12084f6d
authored
Dec 15, 2015
by
Marco Paniconi
Committed by
Gerrit Code Review
Dec 15, 2015
Browse files
Merge "Revert "Add "unknown" status for noise estimation.""
parents
93c0b879
f3e7539c
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
12084f6d
...
...
@@ -496,7 +496,7 @@ static void set_vbp_thresholds(VP9_COMP *cpi, int64_t thresholds[], int q) {
threshold_base
=
3
*
threshold_base
;
else
if
(
noise_level
==
kMedium
)
threshold_base
=
threshold_base
<<
1
;
else
if
(
noise_level
==
kLow
Low
)
else
if
(
noise_level
<
k
Low
)
threshold_base
=
(
7
*
threshold_base
)
>>
3
;
}
if
(
cm
->
width
<=
352
&&
cm
->
height
<=
288
)
{
...
...
vp9/encoder/vp9_noise_estimate.c
View file @
12084f6d
...
...
@@ -25,7 +25,7 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne,
int
width
,
int
height
)
{
ne
->
enabled
=
0
;
ne
->
level
=
k
Unkn
ow
n
;
ne
->
level
=
k
LowL
ow
;
ne
->
value
=
0
;
ne
->
count
=
0
;
ne
->
thresh
=
90
;
...
...
@@ -83,7 +83,7 @@ static void copy_frame(YV12_BUFFER_CONFIG * const dest,
}
NOISE_LEVEL
vp9_noise_estimate_extract_level
(
NOISE_ESTIMATE
*
const
ne
)
{
int
noise_level
=
k
Unkn
ow
n
;
int
noise_level
=
k
LowL
ow
;
if
(
ne
->
value
>
(
ne
->
thresh
<<
1
))
{
noise_level
=
kHigh
;
}
else
{
...
...
vp9/encoder/vp9_noise_estimate.h
View file @
12084f6d
...
...
@@ -24,7 +24,6 @@ extern "C" {
#endif
typedef
enum
noise_level
{
kUnknown
,
kLowLow
,
kLow
,
kMedium
,
...
...
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