commit 1d5cb4668bd96c3a1d17a549691e2ae1e7471370
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Dec 26 11:21:07 2016 +0530
committer JP Sugarbroad <jpsugar@google.com> Thu Apr 13 19:56:13 2017 +0000
tree 362eaaddc45eedaf7b62e677b45235a38375f5bc
parent eac27c6c519328a9fcec537402d311c85f65d0aa

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 1d9c9fe..15e62bc 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2126,8 +2126,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))