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
be4cf6bc
Commit
be4cf6bc
authored
Feb 20, 2014
by
Jingning Han
Committed by
Gerrit Code Review
Feb 20, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Rename vp8_cfg to vp9_cfg in vp9_cx_iface"
parents
65bcabbe
aa7c4954
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
vp9/vp9_cx_iface.c
vp9/vp9_cx_iface.c
+18
-18
No files found.
vp9/vp9_cx_iface.c
View file @
be4cf6bc
...
...
@@ -264,7 +264,7 @@ static vpx_codec_err_t validate_img(vpx_codec_alg_priv_t *ctx,
static
vpx_codec_err_t
set_vp9e_config
(
VP9_CONFIG
*
oxcf
,
vpx_codec_enc_cfg_t
cfg
,
struct
vp9_extracfg
vp
8
_cfg
)
{
struct
vp9_extracfg
vp
9
_cfg
)
{
oxcf
->
version
=
cfg
.
g_profile
;
oxcf
->
width
=
cfg
.
g_w
;
oxcf
->
height
=
cfg
.
g_h
;
...
...
@@ -305,11 +305,11 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
oxcf
->
end_usage
=
USAGE_STREAM_FROM_SERVER
;
oxcf
->
target_bandwidth
=
cfg
.
rc_target_bitrate
;
oxcf
->
rc_max_intra_bitrate_pct
=
vp
8
_cfg
.
rc_max_intra_bitrate_pct
;
oxcf
->
rc_max_intra_bitrate_pct
=
vp
9
_cfg
.
rc_max_intra_bitrate_pct
;
oxcf
->
best_allowed_q
=
cfg
.
rc_min_quantizer
;
oxcf
->
worst_allowed_q
=
cfg
.
rc_max_quantizer
;
oxcf
->
cq_level
=
vp
8
_cfg
.
cq_level
;
oxcf
->
cq_level
=
vp
9
_cfg
.
cq_level
;
oxcf
->
fixed_q
=
-
1
;
oxcf
->
under_shoot_pct
=
cfg
.
rc_undershoot_pct
;
...
...
@@ -330,30 +330,30 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
// oxcf->kf_min_dist = cfg.kf_min_dis;
oxcf
->
key_freq
=
cfg
.
kf_max_dist
;
oxcf
->
cpu_used
=
vp
8
_cfg
.
cpu_used
;
oxcf
->
encode_breakout
=
vp
8
_cfg
.
static_thresh
;
oxcf
->
play_alternate
=
vp
8
_cfg
.
enable_auto_alt_ref
;
oxcf
->
noise_sensitivity
=
vp
8
_cfg
.
noise_sensitivity
;
oxcf
->
sharpness
=
vp
8
_cfg
.
sharpness
;
oxcf
->
cpu_used
=
vp
9
_cfg
.
cpu_used
;
oxcf
->
encode_breakout
=
vp
9
_cfg
.
static_thresh
;
oxcf
->
play_alternate
=
vp
9
_cfg
.
enable_auto_alt_ref
;
oxcf
->
noise_sensitivity
=
vp
9
_cfg
.
noise_sensitivity
;
oxcf
->
sharpness
=
vp
9
_cfg
.
sharpness
;
oxcf
->
two_pass_stats_in
=
cfg
.
rc_twopass_stats_in
;
oxcf
->
output_pkt_list
=
vp
8
_cfg
.
pkt_list
;
oxcf
->
output_pkt_list
=
vp
9
_cfg
.
pkt_list
;
oxcf
->
arnr_max_frames
=
vp
8
_cfg
.
arnr_max_frames
;
oxcf
->
arnr_strength
=
vp
8
_cfg
.
arnr_strength
;
oxcf
->
arnr_type
=
vp
8
_cfg
.
arnr_type
;
oxcf
->
arnr_max_frames
=
vp
9
_cfg
.
arnr_max_frames
;
oxcf
->
arnr_strength
=
vp
9
_cfg
.
arnr_strength
;
oxcf
->
arnr_type
=
vp
9
_cfg
.
arnr_type
;
oxcf
->
tuning
=
vp
8
_cfg
.
tuning
;
oxcf
->
tuning
=
vp
9
_cfg
.
tuning
;
oxcf
->
tile_columns
=
vp
8
_cfg
.
tile_columns
;
oxcf
->
tile_rows
=
vp
8
_cfg
.
tile_rows
;
oxcf
->
tile_columns
=
vp
9
_cfg
.
tile_columns
;
oxcf
->
tile_rows
=
vp
9
_cfg
.
tile_rows
;
oxcf
->
lossless
=
vp
8
_cfg
.
lossless
;
oxcf
->
lossless
=
vp
9
_cfg
.
lossless
;
oxcf
->
error_resilient_mode
=
cfg
.
g_error_resilient
;
oxcf
->
frame_parallel_decoding_mode
=
vp
8
_cfg
.
frame_parallel_decoding_mode
;
oxcf
->
frame_parallel_decoding_mode
=
vp
9
_cfg
.
frame_parallel_decoding_mode
;
oxcf
->
aq_mode
=
vp
8
_cfg
.
aq_mode
;
oxcf
->
aq_mode
=
vp
9
_cfg
.
aq_mode
;
oxcf
->
ss_number_layers
=
cfg
.
ss_number_layers
;
...
...
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