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

Decoder: Fix in checking first_mb_in_slice am: ef27433ca8 am: 274529d8aa am: 3c332522de am: 10f63a26aa am: de892335ff am: a917df6ae0

Browse source 
am: 7543cc871c

Change-Id: I26d7a3f044e9d0d8aca7590a51e1e689904b7815
This commit is contained in:
Harish Mahendrakar 2017-01-18 18:29:25 +00:00 • committed by android-build-merger
commit dd87e2dfef
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
decoder/ih264d_parse_pslice.c
View file

@ -1661,11 +1661,15 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
return 0; return 0;
} }
// Inserting new slice /* Inserting new slice only if the current slice has atleast 1 MB*/
ps_dec->u2_cur_slice_num++; if(ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice <
ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx; (UWORD32)(ps_dec->u2_total_mbs_coded >> ps_slice->u1_mbaff_frame_flag))
ps_dec->i2_prev_slice_mby = ps_dec->u2_mby; {
ps_dec->ps_parse_cur_slice++; ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx;
ps_dec->i2_prev_slice_mby = ps_dec->u2_mby;
ps_dec->u2_cur_slice_num++;
ps_dec->ps_parse_cur_slice++;
}
} }
else else

3
decoder/ih264d_parse_slice.c
View file

@ -1056,8 +1056,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
/*we currently don not support ASO*/ /*we currently don not support ASO*/
if(((u2_first_mb_in_slice << ps_cur_slice->u1_mbaff_frame_flag) if(((u2_first_mb_in_slice << ps_cur_slice->u1_mbaff_frame_flag)
<= ps_dec->u2_cur_mb_addr) && (ps_dec->u2_cur_mb_addr != 0) <= ps_dec->u2_cur_mb_addr) && (ps_dec->u4_first_slice_in_pic == 0))
&& (ps_dec->u4_first_slice_in_pic != 0))
{ {
return ERROR_CORRUPTED_SLICE; return ERROR_CORRUPTED_SLICE;
} }