Skip to content
GitLab
Menu
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
2bfafefb
Commit
2bfafefb
authored
Jan 17, 2014
by
Alex Converse
Committed by
Gerrit Code Review
Jan 17, 2014
Browse files
Merge "Fix key frames for one pass."
parents
d2bb0c51
2b3891d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_firstpass.c
View file @
2bfafefb
...
...
@@ -1965,7 +1965,10 @@ void vp9_get_one_pass_params(VP9_COMP *cpi) {
cpi
->
rc
.
frames_to_key
==
0
||
(
cpi
->
oxcf
.
auto_key
&&
test_for_kf_one_pass
(
cpi
))))
{
cm
->
frame_type
=
KEY_FRAME
;
cpi
->
rc
.
this_key_frame_forced
=
cm
->
current_video_frame
!=
0
&&
cpi
->
rc
.
frames_to_key
==
0
;
cpi
->
rc
.
frames_to_key
=
cpi
->
key_frame_frequency
;
cpi
->
rc
.
kf_boost
=
300
;
}
else
{
cm
->
frame_type
=
INTER_FRAME
;
}
...
...
@@ -1982,7 +1985,10 @@ void vp9_get_one_pass_cbr_params(VP9_COMP *cpi) {
cpi
->
rc
.
frames_to_key
==
0
||
(
cpi
->
oxcf
.
auto_key
&&
test_for_kf_one_pass
(
cpi
))))
{
cm
->
frame_type
=
KEY_FRAME
;
cpi
->
rc
.
this_key_frame_forced
=
cm
->
current_video_frame
!=
0
&&
cpi
->
rc
.
frames_to_key
==
0
;
cpi
->
rc
.
frames_to_key
=
cpi
->
key_frame_frequency
;
cpi
->
rc
.
kf_boost
=
300
;
}
else
{
cm
->
frame_type
=
INTER_FRAME
;
}
...
...
vp9/encoder/vp9_ratectrl.c
View file @
2bfafefb
...
...
@@ -602,7 +602,7 @@ int vp9_rc_pick_q_and_adjust_q_bounds(const VP9_COMP *cpi,
(
last_boosted_q
*
0
.
75
));
active_best_quality
=
MAX
(
qindex
+
delta_qindex
,
rc
->
best_quality
);
}
else
if
(
!
(
cpi
->
pass
==
0
&&
cm
->
current_video_frame
==
0
))
{
// not first frame of one pass
// not first frame of one pass
and kf_boost is set
double
q_adj_factor
=
1
.
0
;
double
q_val
;
...
...
Write
Preview
Supports
Markdown
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