Skip to content

Remove encoder-side limitation for restricted switch frames #5150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mabenjak wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Remove encoder-side limitation for restricted switch frames #5150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1e5fec
Remove encoder-side limitation for restricted switch frames
mabenjak Aug 6, 2026
7f1f5ea
Merge branch 'main' into restricted_sframe_inter_mode_fix
mabenjak Aug 6, 2026
3d9f714
Merge branch 'main' into restricted_sframe_inter_mode_fix
mabenjak Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion av2/encoder/encode_strategy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ int av2_get_refresh_frame_flags(
// been output yet and whose DOH is at least the current
// frame's DOH. (DOH requirement)
if (cm->ref_frame_map[i] != NULL &&
!cm->ref_frame_map[i]->is_restricted &&
cm->ref_frame_map[i]->implicit_output_picture &&
!cm->ref_frame_map[i]->frame_output_done &&
(int)cm->ref_frame_map[i]->display_order_hint >= cur_disp_order) {
Expand Down Expand Up @@ -847,7 +848,7 @@ int av2_get_refresh_frame_flags(
// at least the current frame's DOH. (DOH requirement)
for (int i = 0; i < cpi->common.seq_params.ref_frames; i++) {
const RefCntBuffer *const buf = cpi->common.ref_frame_map[i];
if (buf != NULL && buf->implicit_output_picture &&
if (buf != NULL && !buf->is_restricted && buf->implicit_output_picture &&
!buf->frame_output_done &&
(int)buf->display_order_hint >= cur_disp_order) {
olk_flags_to_keep |= (1 << i);
Expand Down
1 change: 1 addition & 0 deletions av2/encoder/encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5116,6 +5116,7 @@ int av2_encode(AV2_COMP *const cpi, uint8_t *const dest,
cm->ref_frame_map[i]->mlayer_id,
cm->mlayer_id)) {
cm->ref_frame_map[i]->is_restricted = true;
cm->ref_frame_map[i]->display_order_hint = REF_RESTRICTED_DOH;
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions av2/encoder/rdopt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,6 @@ static INLINE int prune_ref_by_selective_ref_frame(
assert(ref_frame[0] != NONE_FRAME);
if (ref_frame[0] == INTRA_FRAME) return 0;

RefCntBuffer *ref0_buf = get_ref_frame_buf(cm, ref_frame[0]);
if (ref0_buf)
if (ref0_buf->is_restricted) return 1;
RefCntBuffer *ref1_buf = get_ref_frame_buf(cm, ref_frame[1]);
if (ref1_buf)
if (ref1_buf->is_restricted) return 1;

const int comp_pred = is_inter_ref_frame(ref_frame[1]);

if (comp_pred && ref_frame[0] >= RANKED_REF0_TO_PRUNE) return 1;
Expand Down Expand Up @@ -259,6 +252,13 @@ static INLINE int prune_ref_by_selective_ref_frame(
}
}

RefCntBuffer *ref0_buf = get_ref_frame_buf(cm, ref_frame[0]);
if (ref0_buf)
if (ref0_buf->is_restricted) return 0;
RefCntBuffer *ref1_buf = get_ref_frame_buf(cm, ref_frame[1]);
if (ref1_buf)
if (ref1_buf->is_restricted) return 0;

int dir_refrank0[2] = { -1, -1 };
int dir_refrank1[2] = { -1, -1 };
int d0 = get_dir_rank(cm, ref_frame[0], dir_refrank0);
Expand Down