Decoder: Fix in error concealment in the case of Mbaff clips am: 3ebff7dc62 am: 8dfaf7cf1b am: 7b9f87283b am: 0b7536238d am: 0cba21c6bf am: 79cfc9557d am: 2871e959d6

am: bb5851eb13

Change-Id: Idb086b43b3ba3bd2f3fee1981266eff2cdb0cab4
This commit is contained in:
Harish Mahendrakar 2017-01-06 18:06:33 +00:00 committed by android-build-merger
commit 1116cd0014

View file

@ -1581,8 +1581,13 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
{ {
// Slice data corrupted // Slice data corrupted
// in the case of mbaff, conceal from the even mb. // 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) if(u1_num_mbs)
{ {
ps_cur_mb_info = ps_dec->ps_nmb_info + u1_num_mbs - 1; ps_cur_mb_info = ps_dec->ps_nmb_info + u1_num_mbs - 1;