wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge SQ1A.220205.002 am: 2191ac2b82

Browse source 
Original change: 1975453

Change-Id: Ie1516e5abacf1daa531382afe5bd4c35d80f91ee
This commit is contained in:
Xin Li 2022-02-08 19:12:23 +00:00 • committed by Automerger Merge Worker
commit de432a4550
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
decoder/ih264d_parse_slice.c
View file

@ -1435,23 +1435,6 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
i1_is_end_of_poc = 0; i1_is_end_of_poc = 0;
} }
/* Increment only if the current slice has atleast 1 more MB */
if (ps_dec->u4_first_slice_in_pic == 0 &&
(ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice <
(UWORD32)(ps_dec->u2_total_mbs_coded >> ps_dec->ps_cur_slice->u1_mbaff_frame_flag)))
{
ps_dec->ps_parse_cur_slice++;
ps_dec->u2_cur_slice_num++;
// in the case of single core increment ps_decode_cur_slice
if(ps_dec->u1_separate_parse == 0)
{
ps_dec->ps_decode_cur_slice++;
}
}
ps_dec->u1_slice_header_done = 0;
if(u1_field_pic_flag) if(u1_field_pic_flag)
{ {
ps_dec->u2_prv_frame_num = u2_frame_num; ps_dec->u2_prv_frame_num = u2_frame_num;
@ -1519,6 +1502,22 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
} }
} }
/* Increment only if the current slice has atleast 1 more MB */
if (ps_dec->u4_first_slice_in_pic == 0 &&
(ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice <
(UWORD32)(ps_dec->u2_total_mbs_coded >> ps_dec->ps_cur_slice->u1_mbaff_frame_flag)))
{
ps_dec->ps_parse_cur_slice++;
ps_dec->u2_cur_slice_num++;
// in the case of single core increment ps_decode_cur_slice
if(ps_dec->u1_separate_parse == 0)
{
ps_dec->ps_decode_cur_slice++;
}
}
ps_dec->u1_slice_header_done = 0;
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/* Copy the values read from the bitstream to the slice header and then*/ /* Copy the values read from the bitstream to the slice header and then*/
/* If the slice is first slice in picture, then do Start of Picture */ /* If the slice is first slice in picture, then do Start of Picture */