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
104d8ec0
Commit
104d8ec0
authored
Feb 26, 2014
by
Alex Converse
Committed by
Gerrit Code Review
Feb 26, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Don't let GOLDEN_FRAME turn off LAST_FRAME as a reference when GOLDEN_FRAME is disabled."
parents
e4118e25
801f136b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
12 deletions
+3
-12
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+3
-12
No files found.
vp9/encoder/vp9_onyx_if.c
View file @
104d8ec0
...
@@ -490,18 +490,6 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) {
...
@@ -490,18 +490,6 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) {
sf
->
thresh_mult
[
THR_D207_PRED
]
+=
2500
;
sf
->
thresh_mult
[
THR_D207_PRED
]
+=
2500
;
sf
->
thresh_mult
[
THR_D63_PRED
]
+=
2500
;
sf
->
thresh_mult
[
THR_D63_PRED
]
+=
2500
;
// disable using golden frame modes if golden frames are not being used
if
(
cpi
->
rc
.
frames_till_gf_update_due
==
INT_MAX
)
{
sf
->
thresh_mult
[
THR_NEARESTG
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_ZEROG
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_NEARG
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_NEWG
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_COMP_ZEROGA
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_COMP_NEARESTGA
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_COMP_NEARGA
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_COMP_NEWGA
]
=
INT_MAX
;
}
/* disable frame modes if flags not set */
/* disable frame modes if flags not set */
if
(
!
(
cpi
->
ref_frame_flags
&
VP9_LAST_FLAG
))
{
if
(
!
(
cpi
->
ref_frame_flags
&
VP9_LAST_FLAG
))
{
sf
->
thresh_mult
[
THR_NEWMV
]
=
INT_MAX
;
sf
->
thresh_mult
[
THR_NEWMV
]
=
INT_MAX
;
...
@@ -3074,6 +3062,9 @@ static void get_ref_frame_flags(VP9_COMP *cpi) {
...
@@ -3074,6 +3062,9 @@ static void get_ref_frame_flags(VP9_COMP *cpi) {
if
(
cpi
->
gold_is_last
)
if
(
cpi
->
gold_is_last
)
cpi
->
ref_frame_flags
&=
~
VP9_GOLD_FLAG
;
cpi
->
ref_frame_flags
&=
~
VP9_GOLD_FLAG
;
if
(
cpi
->
rc
.
frames_till_gf_update_due
==
INT_MAX
)
cpi
->
ref_frame_flags
&=
~
VP9_GOLD_FLAG
;
if
(
cpi
->
alt_is_last
)
if
(
cpi
->
alt_is_last
)
cpi
->
ref_frame_flags
&=
~
VP9_ALT_FLAG
;
cpi
->
ref_frame_flags
&=
~
VP9_ALT_FLAG
;
...
...
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