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

Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc

Browse source 
Original change: 14460944

Change-Id: I300cccfd44f15600ae486e39d12fcd9af87bc556
This commit is contained in:
Ray Essick 2021-06-08 04:16:50 +00:00 • committed by Automerger Merge Worker
commit 6ddeb05426
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
decoder/ih264d_parse_slice.c
View file

@ -1476,17 +1476,20 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
i1_is_end_of_poc = 0; i1_is_end_of_poc = 0;
} }
if (ps_dec->u4_first_slice_in_pic == 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->ps_parse_cur_slice++;
ps_dec->u2_cur_slice_num++; 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++;
}
} }
// in the case of single core increment ps_decode_cur_slice
if((ps_dec->u1_separate_parse == 0) && (ps_dec->u4_first_slice_in_pic == 0))
{
ps_dec->ps_decode_cur_slice++;
}
ps_dec->u1_slice_header_done = 0; ps_dec->u1_slice_header_done = 0;