From dea7f2323b2bc0859b68bf3c694af140c8bcf4f8 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Fri, 14 Oct 2016 17:19:53 +0530 Subject: Decoder: Fixes in handling errors in Mbaff clips. Fixes mb_x, mb_y and first_mb_in_slice for Mbaff error streams CYNGNOS-3312 Bug: 30481714 Change-Id: Ie99f3b57e48a620a4bc7aee88031955a2e1b6753 (cherry picked from commit d79d09f453aa7a026b5e0c5c56a15b59910a527d) (cherry picked from commit a1c987b382f7de65eea301be96c893243bafdfe1) --- decoder/ih264d_utils.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'decoder/ih264d_utils.c') diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c index 77c1733..d356c0d 100644 --- a/decoder/ih264d_utils.c +++ b/decoder/ih264d_utils.c @@ -676,11 +676,7 @@ WORD32 ih264d_init_dec_mb_grp(dec_struct_t *ps_dec) dec_seq_params_t *ps_seq = ps_dec->ps_cur_sps; UWORD8 u1_frm = ps_seq->u1_frame_mbs_only_flag; - ps_dec->u1_recon_mb_grp = PARSE_MB_GROUP_4; - - //NMB set to width in MBs for non-mbaff cases - if(0 == ps_seq->u1_mb_aff_flag) - ps_dec->u1_recon_mb_grp = ps_dec->u2_frm_wd_in_mbs; + ps_dec->u1_recon_mb_grp = ps_dec->u2_frm_wd_in_mbs << ps_seq->u1_mb_aff_flag; ps_dec->u1_recon_mb_grp_pair = ps_dec->u1_recon_mb_grp >> 1; -- cgit v1.2.3