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
12cbaac7
Commit
12cbaac7
authored
Oct 13, 2016
by
Zoe Liu
Committed by
Gerrit Code Review
Oct 13, 2016
Browse files
Merge "Clean code a bit and fix a couple of small bugs in ext-refs" into nextgenv2
parents
9ffdf48c
f0e4669e
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/encoder/encoder.c
View file @
12cbaac7
...
...
@@ -3086,15 +3086,15 @@ static INLINE void shift_last_ref_frames(AV1_COMP *cpi) {
cpi
->
lst_fb_idxes
[
ref_frame
]
=
cpi
->
lst_fb_idxes
[
ref_frame
-
1
];
// [0] is allocated to the current coded frame. The statistics for the
// reference frames start at [1].
// reference frames start at
[LAST_FRAME], i.e.
[1].
if
(
!
cpi
->
rc
.
is_src_frame_alt_ref
)
{
memcpy
(
cpi
->
interp_filter_selected
[
ref_frame
+
1
],
cpi
->
interp_filter_selected
[
ref_frame
],
sizeof
(
cpi
->
interp_filter_selected
[
ref_frame
]));
memcpy
(
cpi
->
interp_filter_selected
[
ref_frame
+
LAST_FRAME
],
cpi
->
interp_filter_selected
[
ref_frame
-
1
+
LAST_FRAME
],
sizeof
(
cpi
->
interp_filter_selected
[
ref_frame
-
1
+
LAST_FRAME
]));
}
}
}
#endif
#endif
// CONFIG_EXT_REFS
void
av1_update_reference_frames
(
AV1_COMP
*
cpi
)
{
AV1_COMMON
*
const
cm
=
&
cpi
->
common
;
...
...
@@ -3181,14 +3181,12 @@ void av1_update_reference_frames(AV1_COMP *cpi) {
int
tmp
=
cpi
->
lst_fb_idxes
[
LAST_REF_FRAMES
-
1
];
shift_last_ref_frames
(
cpi
);
cpi
->
lst_fb_idxes
[
0
]
=
cpi
->
bwd_fb_idx
;
if
(
!
cpi
->
rc
.
is_src_frame_alt_ref
)
{
memcpy
(
cpi
->
interp_filter_selected
[
0
],
cpi
->
interp_filter_selected
[
BWDREF_FRAME
],
sizeof
(
cpi
->
interp_filter_selected
[
BWDREF_FRAME
]));
}
cpi
->
bwd_fb_idx
=
tmp
;
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
BWDREF_FRAME
],
sizeof
(
cpi
->
interp_filter_selected
[
BWDREF_FRAME
]));
}
else
if
(
cpi
->
rc
.
is_src_frame_ext_arf
&&
cm
->
show_existing_frame
)
{
// Deal with the special case for showing existing internal ALTREF_FRAME
// Refresh the LAST_FRAME with the ALTREF_FRAME and retire the LAST3_FRAME
...
...
@@ -3198,15 +3196,15 @@ void av1_update_reference_frames(AV1_COMP *cpi) {
int
tmp
=
cpi
->
lst_fb_idxes
[
LAST_REF_FRAMES
-
1
];
shift_last_ref_frames
(
cpi
);
cpi
->
lst_fb_idxes
[
0
]
=
cpi
->
alt_fb_idx
;
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
],
sizeof
(
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
]));
cpi
->
alt_fb_idx
=
tmp
;
// We need to modify the mapping accordingly
cpi
->
arf_map
[
which_arf
]
=
cpi
->
alt_fb_idx
;
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
],
sizeof
(
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
]));
#endif // CONFIG_EXT_REFS
}
else
{
/* For non key/golden frames */
if
(
cpi
->
refresh_alt_ref_frame
)
{
...
...
@@ -3241,22 +3239,12 @@ void av1_update_reference_frames(AV1_COMP *cpi) {
uref_cnt_fb
(
cpi
->
upsampled_ref_bufs
,
&
cpi
->
upsampled_ref_idx
[
cpi
->
gld_fb_idx
],
new_uidx
);
if
(
!
cpi
->
rc
.
is_src_frame_alt_ref
)
{
#if !CONFIG_EXT_REFS
if
(
!
cpi
->
rc
.
is_src_frame_alt_ref
)
#endif // !CONFIG_EXT_REFS
memcpy
(
cpi
->
interp_filter_selected
[
GOLDEN_FRAME
],
cpi
->
interp_filter_selected
[
0
],
sizeof
(
cpi
->
interp_filter_selected
[
0
]));
}
else
{
int
which_arf
=
0
;
#if CONFIG_EXT_REFS
if
(
cpi
->
oxcf
.
pass
==
2
)
{
const
GF_GROUP
*
const
gf_group
=
&
cpi
->
twopass
.
gf_group
;
which_arf
=
gf_group
->
arf_update_idx
[
gf_group
->
index
];
}
#endif // CONFIG_EXT_REFS
memcpy
(
cpi
->
interp_filter_selected
[
GOLDEN_FRAME
],
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
],
sizeof
(
cpi
->
interp_filter_selected
[
ALTREF_FRAME
+
which_arf
]));
}
}
#if CONFIG_EXT_REFS
...
...
@@ -3271,6 +3259,7 @@ void av1_update_reference_frames(AV1_COMP *cpi) {
cpi
->
alt_fb_idx
=
cpi
->
bwd_fb_idx
;
cpi
->
bwd_fb_idx
=
tmp
;
}
ref_cnt_fb
(
pool
->
frame_bufs
,
&
cm
->
ref_frame_map
[
cpi
->
bwd_fb_idx
],
cm
->
new_fb_idx
);
if
(
use_upsampled_ref
)
...
...
@@ -3354,20 +3343,14 @@ void av1_update_reference_frames(AV1_COMP *cpi) {
tmp
=
cpi
->
lst_fb_idxes
[
LAST_REF_FRAMES
-
1
];
shift_last_ref_frames
(
cpi
);
cpi
->
lst_fb_idxes
[
0
]
=
tmp
;
if
(
!
cpi
->
rc
.
is_src_frame_alt_ref
)
{
if
(
cm
->
show_existing_frame
)
{
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
BWDREF_FRAME
],
sizeof
(
cpi
->
interp_filter_selected
[
BWDREF_FRAME
]));
}
else
{
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
0
],
sizeof
(
cpi
->
interp_filter_selected
[
0
]));
}
}
assert
(
cm
->
show_existing_frame
==
0
);
// NOTE: Currently only LF_UPDATE and INTNL_OVERLAY_UPDATE frames are to
// refresh the LAST_FRAME.
memcpy
(
cpi
->
interp_filter_selected
[
LAST_FRAME
],
cpi
->
interp_filter_selected
[
0
],
sizeof
(
cpi
->
interp_filter_selected
[
0
]));
}
#else
ref_cnt_fb
(
pool
->
frame_bufs
,
&
cm
->
ref_frame_map
[
cpi
->
lst_fb_idx
],
...
...
av1/encoder/firstpass.c
View file @
12cbaac7
...
...
@@ -2585,10 +2585,11 @@ static void configure_buffer_updates(AV1_COMP *cpi) {
if
(
cpi
->
num_extra_arfs
)
{
int
tmp
=
cpi
->
bwd_fb_idx
;
cpi
->
rc
.
is_bwd_ref_frame
=
1
;
cpi
->
bwd_fb_idx
=
cpi
->
alt_fb_idx
;
cpi
->
alt_fb_idx
=
cpi
->
arf_map
[
0
];
cpi
->
arf_map
[
0
]
=
tmp
;
cpi
->
rc
.
is_bwd_ref_frame
=
1
;
}
else
{
cpi
->
rc
.
is_bwd_ref_frame
=
0
;
}
...
...
@@ -2639,11 +2640,13 @@ static void configure_buffer_updates(AV1_COMP *cpi) {
// NOTE: The indices will be swapped back after this frame is encoded
// (in av1_update_reference_frames()).
int
tmp
=
cpi
->
bwd_fb_idx
;
cpi
->
bwd_fb_idx
=
cpi
->
alt_fb_idx
;
cpi
->
alt_fb_idx
=
cpi
->
arf_map
[
0
];
cpi
->
arf_map
[
0
]
=
tmp
;
}
break
;
case
LAST_BIPRED_UPDATE
:
cpi
->
refresh_last_frame
=
0
;
cpi
->
refresh_golden_frame
=
0
;
...
...
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