Decoder: Fix in error concealment in the case of Mbaff clips am: 3ebff7dc62 am: 8dfaf7cf1b am: 7b9f87283b

am: 0b7536238d

Change-Id: I7eb6ba967c2ef32a58aef670d17b18176314f9a2
This commit is contained in:
Harish Mahendrakar 2017-01-06 17:51:31 +00:00 committed by android-build-merger
commit 0cba21c6bf

View file

@ -1581,8 +1581,13 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
{
// Slice data corrupted
// in the case of mbaff, conceal from the even mb.
u1_num_mbs = (ps_dec->u4_num_mbs_cur_nmb >> u1_mbaff ) << u1_mbaff;
if((u1_mbaff) && (ps_dec->u4_num_mbs_cur_nmb & 1))
{
ps_dec->u4_num_mbs_cur_nmb = ps_dec->u4_num_mbs_cur_nmb - 1;
ps_dec->u2_cur_mb_addr--;
}
u1_num_mbs = ps_dec->u4_num_mbs_cur_nmb;
if(u1_num_mbs)
{
ps_cur_mb_info = ps_dec->ps_nmb_info + u1_num_mbs - 1;