commit 87eb12487b870805f983310c75ee736166faa53d
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Dec 26 11:21:07 2016 +0530
committer gitbuildkicker <android-build@google.com> Wed Apr 19 11:18:37 2017 -0700
tree 6e315a199309edf95b1e9b7e88632c14db5216b1
parent e06af0c93cd93e9640067d274229734f81337dd7

Decoder: Fixed number of MB calculation for interlaced error streams

At the end of picture processing, if the current pic is partially
decoded, number of MBs to be processed was wrongly calculated for
interlaced cases.

Bug: 33129467
Change-Id: Ia81186c60d346f02663607f2dc14166781db6a69
(cherry picked from commit e1cf7ea8ae9af4d8b5aca7efba61025dae10a345)

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 19afa5b..33fd11f 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2159,8 +2159,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))