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
f1633e58
Commit
f1633e58
authored
Feb 21, 2014
by
Yaowu Xu
Committed by
Gerrit Code Review
Feb 21, 2014
Browse files
Merge "Remove an unused variable"
parents
64548b64
c58e1c7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_onyx.h
View file @
f1633e58
...
...
@@ -112,7 +112,6 @@ extern "C" {
int
auto_key
;
// autodetect cut scenes and set the keyframes
int
key_freq
;
// maximum distance to key frame.
int
allow_lag
;
// allow lagged compression (if 0 lagin frames is ignored)
int
lag_in_frames
;
// how many frames lag before we start encoding
// ----------------------------------------------------------------
...
...
vp9/encoder/vp9_onyx_if.c
View file @
f1633e58
...
...
@@ -1505,13 +1505,9 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi
->
speed
=
abs
(
cpi
->
oxcf
.
cpu_used
);
if
(
cpi
->
oxcf
.
lag_in_frames
==
0
)
{
// Force allow_lag to 0 if lag_in_frames is 0.
cpi
->
oxcf
.
allow_lag
=
0
;
}
else
if
(
cpi
->
oxcf
.
lag_in_frames
>
MAX_LAG_BUFFERS
)
{
// Limit on lag buffers as these are not currently dynamically allocated.
// Limit on lag buffers as these are not currently dynamically allocated.
if
(
cpi
->
oxcf
.
lag_in_frames
>
MAX_LAG_BUFFERS
)
cpi
->
oxcf
.
lag_in_frames
=
MAX_LAG_BUFFERS
;
}
#if CONFIG_MULTIPLE_ARF
vp9_zero
(
cpi
->
alt_ref_source
);
...
...
vp9/vp9_cx_iface.c
View file @
f1633e58
...
...
@@ -289,10 +289,8 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
}
if
(
cfg
.
g_pass
==
VPX_RC_FIRST_PASS
)
{
oxcf
->
allow_lag
=
0
;
oxcf
->
lag_in_frames
=
0
;
}
else
{
oxcf
->
allow_lag
=
(
cfg
.
g_lag_in_frames
)
>
0
;
oxcf
->
lag_in_frames
=
cfg
.
g_lag_in_frames
;
}
...
...
@@ -390,7 +388,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
printf("two_pass_vbrbias: %d\n", oxcf->two_pass_vbrbias);
printf("two_pass_vbrmin_section: %d\n", oxcf->two_pass_vbrmin_section);
printf("two_pass_vbrmax_section: %d\n", oxcf->two_pass_vbrmax_section);
printf("allow_lag: %d\n", oxcf->allow_lag);
printf("lag_in_frames: %d\n", oxcf->lag_in_frames);
printf("play_alternate: %d\n", oxcf->play_alternate);
printf("Version: %d\n", oxcf->Version);
...
...
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