Merge "Decoder: Fix in MB count in MBAff error handling" into mnc-dev

This commit is contained in:
Marco Nelissen 2017-01-09 15:58:25 +00:00 committed by Android (Google) Code Review
commit d1ebbd7139

View file

@ -1464,6 +1464,11 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
ih264d_err_pic_dispbuf_mgr(ps_dec); ih264d_err_pic_dispbuf_mgr(ps_dec);
return 0; return 0;
} }
if(ps_dec->ps_cur_slice->u1_mbaff_frame_flag && (num_mb_skip & 1))
{
num_mb_skip++;
}
ps_dec->ps_dpb_cmds->u1_long_term_reference_flag = 0; ps_dec->ps_dpb_cmds->u1_long_term_reference_flag = 0;
if(prev_slice_err == 1) if(prev_slice_err == 1)
{ {