Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
60d192db
Commit
60d192db
authored
Oct 24, 2014
by
Paul Wilkins
Committed by
Gerrit Code Review
Oct 24, 2014
Browse files
Merge "Enable dual arf with constant q."
parents
3758650c
8fc3ab77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+1
-1
vp9/encoder/vp9_ratectrl.c
vp9/encoder/vp9_ratectrl.c
+7
-1
No files found.
vp9/encoder/vp9_encoder.c
View file @
60d192db
...
...
@@ -3505,7 +3505,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
// Note that at the moment multi_arf is only configured for 2 pass VBR and
// will not work properly with svc.
if
((
oxcf
->
pass
==
2
)
&&
!
cpi
->
use_svc
&&
(
cpi
->
oxcf
.
enable_auto_arf
>
1
)
&&
(
cpi
->
oxcf
.
rc_mode
==
VPX_VBR
)
)
(
cpi
->
oxcf
.
enable_auto_arf
>
1
))
cpi
->
multi_arf_allowed
=
1
;
else
cpi
->
multi_arf_allowed
=
0
;
...
...
vp9/encoder/vp9_ratectrl.c
View file @
60d192db
...
...
@@ -971,7 +971,13 @@ static int rc_pick_q_and_bounds_two_pass(const VP9_COMP *cpi,
if
(
!
cpi
->
refresh_alt_ref_frame
)
{
active_best_quality
=
cq_level
;
}
else
{
active_best_quality
=
get_gf_active_quality
(
rc
,
q
,
cm
->
bit_depth
);
const
GF_GROUP
*
const
gf_group
=
&
cpi
->
twopass
.
gf_group
;
active_best_quality
=
get_gf_active_quality
(
rc
,
q
,
cm
->
bit_depth
);
// Modify best quality for second level arfs. For mode VPX_Q this
// becomes the baseline frame q.
if
(
gf_group
->
rf_level
[
gf_group
->
index
]
==
GF_ARF_LOW
)
active_best_quality
=
(
active_best_quality
+
cq_level
+
1
)
/
2
;
}
}
else
{
active_best_quality
=
get_gf_active_quality
(
rc
,
q
,
cm
->
bit_depth
);
...
...
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