Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
a2832f1b
Commit
a2832f1b
authored
Dec 21, 2015
by
Zoe Liu
Committed by
Gerrit Code Review
Dec 21, 2015
Browse files
Merge "Cleared the EXT_REFS code to make it more legible." into nextgenv2
parents
305fac7a
a4d0c714
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/bitstream.c
View file @
a2832f1b
...
...
@@ -1483,14 +1483,15 @@ static void write_tile_info(const VP10_COMMON *const cm,
}
static
int
get_refresh_mask
(
VP10_COMP
*
cpi
)
{
#if CONFIG_EXT_REFS
int
refresh_mask
=
0
;
#if CONFIG_EXT_REFS
int
ref_frame
;
for
(
ref_frame
=
LAST_FRAME
;
ref_frame
<=
LAST4_FRAME
;
++
ref_frame
)
{
refresh_mask
|=
(
cpi
->
refresh_last_frames
[
ref_frame
-
LAST_FRAME
]
<<
cpi
->
lst_fb_idxes
[
ref_frame
-
LAST_FRAME
]);
}
#else
refresh_mask
=
cpi
->
refresh_last_frame
<<
cpi
->
lst_fb_idx
;
#endif // CONFIG_EXT_REFS
if
(
vp10_preserve_existing_gf
(
cpi
))
{
...
...
@@ -1504,23 +1505,14 @@ static int get_refresh_mask(VP10_COMP *cpi) {
// Note: This is highly specific to the use of ARF as a forward reference,
// and this needs to be generalized as other uses are implemented
// (like RTC/temporal scalability).
#if CONFIG_EXT_REFS
return
refresh_mask
|
#else
return
(
cpi
->
refresh_last_frame
<<
cpi
->
lst_fb_idx
)
|
#endif // CONFIG_EXT_REFS
(
cpi
->
refresh_golden_frame
<<
cpi
->
alt_fb_idx
);
return
refresh_mask
|
(
cpi
->
refresh_golden_frame
<<
cpi
->
alt_fb_idx
);
}
else
{
int
arf_idx
=
cpi
->
alt_fb_idx
;
if
((
cpi
->
oxcf
.
pass
==
2
)
&&
cpi
->
multi_arf_allowed
)
{
const
GF_GROUP
*
const
gf_group
=
&
cpi
->
twopass
.
gf_group
;
arf_idx
=
gf_group
->
arf_update_idx
[
gf_group
->
index
];
}
#if CONFIG_EXT_REFS
return
refresh_mask
|
#else
return
(
cpi
->
refresh_last_frame
<<
cpi
->
lst_fb_idx
)
|
#endif // CONFIG_EXT_REFS
(
cpi
->
refresh_golden_frame
<<
cpi
->
gld_fb_idx
)
|
(
cpi
->
refresh_alt_ref_frame
<<
arf_idx
);
}
...
...
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