commit f273d0f53b8d7af7dc6b4b0bcca3a05f351fea60
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Jan 17 20:44:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 17 20:44:57 2017 +0000
tree 71ce0dec60569882513eca6d1ac8e597aaf3a189
parent 1ee70550c42d522e51a75813b51d7d106a100d4f
parent 06b61cfbe1d8173091fd3bf4245463f712e88050

Decoder: Fixed number of MB calculation for interlaced error streams am: e1cf7ea8ae am: 4e7779e0ef am: ba9af1da5d am: aa51017b8f
am: 06b61cfbe1

Change-Id: I7c8748afaefdddbc170ab55c1da7fa7fe7ae0d16

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 4a81465..6e7db47 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2164,8 +2164,9 @@
         WORD32 prev_slice_err;
         pocstruct_t temp_poc;
         WORD32 ret1;
-
-        num_mb_skipped = (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs)
+        WORD32 ht_in_mbs;
+        ht_in_mbs = ps_dec->u2_pic_ht >> (4 + ps_dec->ps_cur_slice->u1_field_pic_flag);
+        num_mb_skipped = (ht_in_mbs * ps_dec->u2_frm_wd_in_mbs)
                             - ps_dec->u2_total_mbs_coded;
 
         if(ps_dec->u4_first_slice_in_pic && (ps_dec->u4_pic_buf_got == 0))