Skip to content

libavc: fix hanging issue for recon and deblocking thread #144

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

Merged
harishdm merged 1 commit into from
Sep 10, 2026
Merged

libavc: fix hanging issue for recon and deblocking thread #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions decoder/ih264d_thread_compute_bs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void ih264d_check_mb_map_deblk(dec_struct_t *ps_dec,
for(i = 0; i < deblk_mb_grp; i++)
{
WORD32 nop_cnt = 8*128;
while(u4_check_mb_map == 1)
while(u4_check_mb_map == 1 && ps_dec->i4_break_threads != 1 && ps_dec->i4_error_code == 0)
{
u4_mb_num = ps_dec->u4_cur_deblk_mb_num;
/*we wait for the right mb because of intra pred data dependency*/
Expand All @@ -365,6 +365,10 @@ void ih264d_check_mb_map_deblk(dec_struct_t *ps_dec,
}
}
}
if(ps_dec->i4_break_threads == 1 || ps_dec->i4_error_code != 0)
{
break;
}

ih264d_deblock_mb_nonmbaff(ps_dec, ps_tfr_cxt,
i4_cb_qp_idx_ofst, i4_cr_qp_idx_ofst,
Expand Down Expand Up @@ -399,13 +403,13 @@ void ih264d_recon_deblk_slice(dec_struct_t *ps_dec, tfr_ctxt_t *ps_tfr_cxt)
UWORD32 x_offset, y_offset;
UWORD32 u4_slice_end;
pad_mgr_t *ps_pad_mgr ;
WORD32 nop_cnt = 8*128;

/*check for mb map of first mb in slice to ensure slice header is parsed*/
while(1)
while(ps_dec->i4_break_threads != 1 && ps_dec->i4_error_code == 0)
{
UWORD32 u4_mb_num = ps_dec->cur_recon_mb_num;
UWORD32 u4_cond = 0;
WORD32 nop_cnt = 8*128;

CHECK_MB_MAP_BYTE(u4_mb_num, ps_dec->pu1_recon_mb_map, u4_cond);
if(u4_cond)
Expand Down Expand Up @@ -444,6 +448,10 @@ void ih264d_recon_deblk_slice(dec_struct_t *ps_dec, tfr_ctxt_t *ps_tfr_cxt)

}
}
if(ps_dec->i4_break_threads == 1 || ps_dec->i4_error_code != 0)
{
return;
}

u4_max_addr = ps_dec->ps_cur_sps->u4_max_mb_addr;
u1_mb_aff = ps_dec->ps_cur_slice->u1_mbaff_frame_flag;
Expand Down Expand Up @@ -528,7 +536,7 @@ void ih264d_recon_deblk_slice(dec_struct_t *ps_dec, tfr_ctxt_t *ps_tfr_cxt)
}


while(1)
while(ps_dec->i4_break_threads != 1 && ps_dec->i4_error_code == 0)
{
UWORD32 u4_cond = 0;
UWORD32 u4_mb_num = ps_dec->cur_recon_mb_num + recon_mb_grp - 1;
Expand Down Expand Up @@ -574,6 +582,10 @@ void ih264d_recon_deblk_slice(dec_struct_t *ps_dec, tfr_ctxt_t *ps_tfr_cxt)
}
}
}
if(ps_dec->i4_break_threads == 1 || ps_dec->i4_error_code != 0)
{
return;
}

for(j = 0; j < recon_mb_grp; j++)
{
Expand Down Expand Up @@ -724,7 +736,8 @@ void ih264d_recon_deblk_thread(dec_struct_t *ps_dec)

DEBUG_THREADS_PRINTF(" Exit compute bs slice \n");

if(ps_dec->cur_recon_mb_num > ps_dec->ps_cur_sps->u4_max_mb_addr)
if((ps_dec->cur_recon_mb_num > ps_dec->ps_cur_sps->u4_max_mb_addr) ||
(ps_dec->i4_error_code != 0) || (ps_dec->i4_break_threads == 1))
{
break;
}
Expand Down
18 changes: 13 additions & 5 deletions decoder/ih264d_thread_parse_decode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ WORD32 ih264d_decode_recon_tfr_nmb_thread(dec_struct_t * ps_dec,

u2_cur_dec_mb_num = ps_dec->cur_dec_mb_num;

while(1)
while(ps_dec->i4_break_threads != 1 && ps_dec->i4_error_code == 0)
{

UWORD32 u4_max_mb = (UWORD32)(ps_dec->i2_dec_thread_mb_y + (1 << u1_mbaff)) * ps_dec->u2_frm_wd_in_mbs - 1;
Expand Down Expand Up @@ -267,6 +267,10 @@ WORD32 ih264d_decode_recon_tfr_nmb_thread(dec_struct_t * ps_dec,
}
}
}
if(ps_dec->i4_break_threads == 1 || ps_dec->i4_error_code != 0)
{
return NOT_OK;
}
/* N Mb MC Loop */
for(i = 0; i < u4_num_mbs; i++)
{
Expand Down Expand Up @@ -446,15 +450,15 @@ WORD32 ih264d_decode_slice_thread(dec_struct_t *ps_dec)
UWORD8 u1_field_pic;
UWORD32 u4_frame_stride, x_offset, y_offset;
WORD32 ret;
WORD32 nop_cnt = 8 * 128;

tfr_ctxt_t *ps_trns_addr;

/*check for mb map of first mb in slice to ensure slice header is parsed*/
while(1)
while(ps_dec->i4_break_threads != 1 && ps_dec->i4_error_code == 0)
{
UWORD32 u4_mb_num = ps_dec->cur_dec_mb_num;
UWORD32 u4_cond = 0;
WORD32 nop_cnt = 8 * 128;
CHECK_MB_MAP_BYTE(u4_mb_num, ps_dec->pu1_dec_mb_map, u4_cond);
if(u4_cond)
{
Expand Down Expand Up @@ -489,6 +493,10 @@ WORD32 ih264d_decode_slice_thread(dec_struct_t *ps_dec)

}
}
if(ps_dec->i4_break_threads == 1 || ps_dec->i4_error_code != 0)
{
return NOT_OK;
}



Expand Down Expand Up @@ -624,8 +632,8 @@ void ih264d_decode_picture_thread(dec_struct_t *ps_dec )
DEBUG_THREADS_PRINTF(" Exit ih264d_decode_slice_thread \n");


if(ps_dec->cur_dec_mb_num
> ps_dec->ps_cur_sps->u4_max_mb_addr)
if((ps_dec->cur_dec_mb_num > ps_dec->ps_cur_sps->u4_max_mb_addr) ||
(ps_dec->i4_error_code != 0) || (ps_dec->i4_break_threads == 1))
{
/*Last slice in frame*/
break;
Expand Down
Loading