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

Decoder: Modified loop condition while parsing ref_list_reordering. am: 7ea47d575d am: 8d081b93a8 am: ae0dcda477 am: 65da9e8e53 am: 451792cab1 am: dc0e289d45 am: c1bff2a31b am: e08336ba88

Browse source 
am: ad29aed343

Change-Id: Ib0d6d19006a09c331b5b85e4fe5d9edd325068ac
This commit is contained in:
Ritu Baldwa 2017-12-01 21:19:32 +00:00 • committed by android-build-merger
commit 9304844cd5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
decoder/ih264d_dpb_mgr.c
View file

@ -722,7 +722,7 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx)
UWORD16 ui_max_frame_num = UWORD16 ui_max_frame_num =
ps_dec->ps_cur_sps->u2_u4_max_pic_num_minus1 + 1; ps_dec->ps_cur_sps->u2_u4_max_pic_num_minus1 + 1;
WORD32 i; WORD32 i, count = 0;
UWORD32 ui_remapIdc, ui_nextUev; UWORD32 ui_remapIdc, ui_nextUev;
WORD16 u2_pred_frame_num = u4_cur_pic_num; WORD16 u2_pred_frame_num = u4_cur_pic_num;
WORD32 i_temp; WORD32 i_temp;
@ -743,7 +743,8 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx)
ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf);
while(ui_remapIdc != 3) while((ui_remapIdc != 3)
&& (count < ps_cur_slice->u1_num_ref_idx_lx_active[uc_lx]))
{ {
ui_nextUev = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); ui_nextUev = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf);
if(ui_remapIdc != 2) if(ui_remapIdc != 2)
@ -812,6 +813,7 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx)
ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf);
/* Get the remapping_idc - 0/1/2/3 */ /* Get the remapping_idc - 0/1/2/3 */
count++;
} }
//Handle the ref indices that were not remapped //Handle the ref indices that were not remapped