commit 21851eaecc814be709cb0c20f732cb858cfe1440
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Dec 27 13:54:13 2016 +0530
committer gitbuildkicker <android-build@google.com> Thu Jan 19 16:31:00 2017 -0800
tree 070c0182e18d296e2431df3eb121b025882772d1
parent aa78b96e842fc1fb70a18acff22be35c7a715b23

Decoder: Fix in MB count in MBAff error handling

Number of MBs to be marked as skip should be even for MBAff
error streams

Bug: 33450635
Change-Id: I6af59632e4b2d2882881fe8c52472164ea088f7a
(cherry picked from commit 43e0aa221067341b0b32bc87410a1ca45d9a6455)

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 63fa179..9d4e687 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1462,6 +1462,11 @@
         ih264d_err_pic_dispbuf_mgr(ps_dec);
         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;
     if(prev_slice_err == 1)
     {