commit 6676aeb4195e7c7379915c0972f3d209410f0641
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Oct 14 17:19:53 2016 +0530
committer Marco Nelissen <marcone@google.com> Tue Oct 18 12:19:18 2016 -0700
tree 8fc4a1b9b1e3b32c7c254479b23b55717eeebc96
parent 026745ef046e646b8d04f4f57d8320042f6b29b0

Decoder: Fixes in handling errors in Mbaff clips.

Fixes mb_x, mb_y and first_mb_in_slice for Mbaff error streams

Bug: 30481714

Change-Id: Ie99f3b57e48a620a4bc7aee88031955a2e1b6753

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 32f79c8..7c3b9cf 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1684,14 +1684,14 @@
         ps_dec->ps_parse_cur_slice->ppv_map_ref_idx_to_poc = (volatile void **)pu1_buf;
     }
 
-    ps_dec->ps_cur_slice->u2_first_mb_in_slice = ps_dec->u2_total_mbs_coded << u1_mbaff;
+    ps_dec->ps_cur_slice->u2_first_mb_in_slice = ps_dec->u2_total_mbs_coded >> u1_mbaff;
     ps_dec->ps_cur_slice->i1_slice_alpha_c0_offset = 0;
     ps_dec->ps_cur_slice->i1_slice_beta_offset = 0;
 
     if(ps_dec->ps_cur_slice->u1_field_pic_flag)
         ps_dec->u2_prv_frame_num = ps_dec->ps_cur_slice->u2_frame_num;
 
-    ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice = ps_dec->u2_total_mbs_coded << u1_mbaff;
+    ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice = ps_dec->u2_total_mbs_coded >> u1_mbaff;
     ps_dec->ps_parse_cur_slice->u2_log2Y_crwd =    ps_dec->ps_cur_slice->u2_log2Y_crwd;
 
 
@@ -1714,6 +1714,11 @@
     ps_dec->ps_parse_cur_slice->slice_type = P_SLICE;
     ps_dec->pf_mvpred_ref_tfr_nby2mb = ih264d_mv_pred_ref_tfr_nby2_pmb;
     ps_dec->ps_part = ps_dec->ps_parse_part_params;
+    ps_dec->u2_mbx =
+                    (MOD(ps_dec->ps_cur_slice->u2_first_mb_in_slice - 1, ps_dec->u2_frm_wd_in_mbs));
+    ps_dec->u2_mby =
+                    (DIV(ps_dec->ps_cur_slice->u2_first_mb_in_slice - 1, ps_dec->u2_frm_wd_in_mbs));
+    ps_dec->u2_mby <<= u1_mbaff;
 
     /******************************************************/
     /* Parsing / decoding the slice                       */

decoder/ih264d_utils.c

diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c
index c01545d..3567785 100644
--- a/decoder/ih264d_utils.c
+++ b/decoder/ih264d_utils.c
@@ -802,11 +802,7 @@
     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;