Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
c8e8d3a4
Commit
c8e8d3a4
authored
Jan 09, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jan 09, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Renaming 'Sharpness' to 'sharpness'."
parents
f3b9b97c
57be8136
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
vp9/common/vp9_onyx.h
vp9/common/vp9_onyx.h
+1
-1
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+2
-2
vp9/encoder/vp9_picklpf.c
vp9/encoder/vp9_picklpf.c
+1
-1
vp9/vp9_cx_iface.c
vp9/vp9_cx_iface.c
+6
-6
No files found.
vp9/common/vp9_onyx.h
View file @
c8e8d3a4
...
...
@@ -81,7 +81,7 @@ extern "C"
int64_t
target_bandwidth
;
// bandwidth to be used in kilobits per second
int
noise_sensitivity
;
// pre processing blur: recommendation 0
int
S
harpness
;
// sharpening output: recommendation 0:
int
s
harpness
;
// sharpening output: recommendation 0:
int
cpu_used
;
unsigned
int
rc_max_intra_bitrate_pct
;
...
...
vp9/encoder/vp9_onyx_if.c
View file @
c8e8d3a4
...
...
@@ -1415,9 +1415,9 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cm
->
display_height
=
cpi
->
oxcf
.
height
;
// VP8 sharpness level mapping 0-7 (vs 0-10 in general VPx dialogs)
cpi
->
oxcf
.
S
harpness
=
MIN
(
7
,
cpi
->
oxcf
.
S
harpness
);
cpi
->
oxcf
.
s
harpness
=
MIN
(
7
,
cpi
->
oxcf
.
s
harpness
);
cpi
->
common
.
lf
.
sharpness_level
=
cpi
->
oxcf
.
S
harpness
;
cpi
->
common
.
lf
.
sharpness_level
=
cpi
->
oxcf
.
s
harpness
;
if
(
cpi
->
initial_width
)
{
// Increasing the size of the frame beyond the first seen frame, or some
...
...
vp9/encoder/vp9_picklpf.c
View file @
c8e8d3a4
...
...
@@ -117,7 +117,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi, int partial) {
vpx_yv12_copy_y
(
cm
->
frame_to_show
,
&
cpi
->
last_frame_uf
);
lf
->
sharpness_level
=
cm
->
frame_type
==
KEY_FRAME
?
0
:
cpi
->
oxcf
.
S
harpness
;
:
cpi
->
oxcf
.
s
harpness
;
// Start the search at the previous frame filter level unless it is now out of
// range.
...
...
vp9/vp9_cx_iface.c
View file @
c8e8d3a4
...
...
@@ -25,7 +25,7 @@ struct vp9_extracfg {
int
cpu_used
;
/* available cpu percentage in 1/16 */
unsigned
int
enable_auto_alt_ref
;
unsigned
int
noise_sensitivity
;
unsigned
int
S
harpness
;
unsigned
int
s
harpness
;
unsigned
int
static_thresh
;
unsigned
int
tile_columns
;
unsigned
int
tile_rows
;
...
...
@@ -53,7 +53,7 @@ static const struct extraconfig_map extracfg_map[] = {
0
,
/* cpu_used */
1
,
/* enable_auto_alt_ref */
0
,
/* noise_sensitivity */
0
,
/*
S
harpness */
0
,
/*
s
harpness */
0
,
/* static_thresh */
0
,
/* tile_columns */
0
,
/* tile_rows */
...
...
@@ -190,7 +190,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
RANGE_CHECK
(
vp8_cfg
,
tile_columns
,
0
,
6
);
RANGE_CHECK
(
vp8_cfg
,
tile_rows
,
0
,
2
);
RANGE_CHECK_HI
(
vp8_cfg
,
S
harpness
,
7
);
RANGE_CHECK_HI
(
vp8_cfg
,
s
harpness
,
7
);
RANGE_CHECK
(
vp8_cfg
,
arnr_max_frames
,
0
,
15
);
RANGE_CHECK_HI
(
vp8_cfg
,
arnr_strength
,
6
);
RANGE_CHECK
(
vp8_cfg
,
arnr_type
,
1
,
3
);
...
...
@@ -323,7 +323,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
oxcf
->
encode_breakout
=
vp8_cfg
.
static_thresh
;
oxcf
->
play_alternate
=
vp8_cfg
.
enable_auto_alt_ref
;
oxcf
->
noise_sensitivity
=
vp8_cfg
.
noise_sensitivity
;
oxcf
->
S
harpness
=
vp8_cfg
.
S
harpness
;
oxcf
->
s
harpness
=
vp8_cfg
.
s
harpness
;
oxcf
->
two_pass_stats_in
=
cfg
.
rc_twopass_stats_in
;
oxcf
->
output_pkt_list
=
vp8_cfg
.
pkt_list
;
...
...
@@ -349,7 +349,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
printf("Current VP9 Settings: \n");
printf("target_bandwidth: %d\n", oxcf->target_bandwidth);
printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity);
printf("
S
harpness: %d\n", oxcf->
S
harpness);
printf("
s
harpness: %d\n", oxcf->
s
harpness);
printf("cpu_used: %d\n", oxcf->cpu_used);
printf("Mode: %d\n", oxcf->mode);
// printf("delete_first_pass_file: %d\n", oxcf->delete_first_pass_file);
...
...
@@ -442,7 +442,7 @@ static vpx_codec_err_t set_param(vpx_codec_alg_priv_t *ctx,
MAP
(
VP8E_SET_CPUUSED
,
xcfg
.
cpu_used
);
MAP
(
VP8E_SET_ENABLEAUTOALTREF
,
xcfg
.
enable_auto_alt_ref
);
MAP
(
VP8E_SET_NOISE_SENSITIVITY
,
xcfg
.
noise_sensitivity
);
MAP
(
VP8E_SET_SHARPNESS
,
xcfg
.
S
harpness
);
MAP
(
VP8E_SET_SHARPNESS
,
xcfg
.
s
harpness
);
MAP
(
VP8E_SET_STATIC_THRESHOLD
,
xcfg
.
static_thresh
);
MAP
(
VP9E_SET_TILE_COLUMNS
,
xcfg
.
tile_columns
);
MAP
(
VP9E_SET_TILE_ROWS
,
xcfg
.
tile_rows
);
...
...
Write
Preview
Markdown
is supported
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