Commit f0efc5fa authored by Cidana Developers's avatar Cidana Developers Committed by Hassene Tmar
Browse files

fix overlay issue 

1. fix `picture_decision_undisplayed_queue_count` mismatch issue caused by calling sequence changing in `OPT_RPS_CONSTR`
parent 759d5bd8

Source/API/EbDebugMacros.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ extern "C" { 
#define OPT_RPS_CONSTR_3           1

#define FIX_INCOMP_MG_2            1 // Use 3L for incomplete MGs for all RA cases

#define CLN_REMOVE_REF_CNT         1 // Remove scs->reference_count

#define FIX_OVERLAY                1 // Fix overlay issue when OPT_RPS_CONSTR changes calling sequence

#endif



#define FIX_LAYER_SIGNAL           1

Source/Lib/Encoder/Codec/EbPictureDecisionProcess.c

+7 −0
Original line number Diff line number Diff line
@@ -8155,7 +8155,9 @@ void* picture_decision_kernel(void *input_ptr) { 
                            if (pred_position_ptr->temporal_layer_index == 0 && pcs->slice_type != I_SLICE) {

                                pcs->is_alt_ref = 1;

                                pcs->frm_hdr.show_frame = 0;

#if !FIX_OVERLAY

                                ((PictureParentControlSet*)encode_ctx->pre_assignment_buffer[pic_idx - 1]->object_ptr)->has_show_existing = FALSE;

#endif

                            }

                            // release the overlay PCS for non alt ref pictures. First picture does not have overlay PCS

                            else if (pcs->picture_number) {
@@ -8360,6 +8362,11 @@ void* picture_decision_kernel(void *input_ptr) { 
                        PictureParentControlSet* pcs_1 = ctx->mg_pictures_array_disp_order[pic_i];

                        pcs_1->first_frame_in_minigop = !pic_i;

                        set_gf_group_param(pcs_1);

#if FIX_OVERLAY

                        if (pcs_1->is_alt_ref) {

                            ctx->mg_pictures_array_disp_order[pic_i - 1]->has_show_existing = FALSE;

                        }

#endif

                    }

#endif