commit f39228a42423df35c8750cf8c1af189d1df2cb42
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Dec 20 11:13:55 2016 +0530
committer gitbuildkicker <android-build@google.com> Fri Jan 20 13:45:13 2017 -0800
tree 6d6769dbe7b3f1e358937d51f8748492458de2e1
parent 0030772d7ad59a8252e84fb5103db775ff31921c

Decoder: Fix in error concealment in the case of Mbaff clips

In case of MBAff clips, if error is detected after parsing odd MB,
then treat that odd MB also as error. All MBAff processing is done
as an MB-Pair.

Bug: 33298089
(cherry picked from commit 3ebff7dc62f6fb93d9635dd052c1140ddcc63dc7)

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 0ae7e9e..e2acd4a 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1581,8 +1581,13 @@
         {
             // Slice data corrupted
             // in the case of mbaff, conceal from the even mb.
-            u1_num_mbs = (ps_dec->u4_num_mbs_cur_nmb >> u1_mbaff ) << u1_mbaff;
+            if((u1_mbaff) && (ps_dec->u4_num_mbs_cur_nmb & 1))
+            {
+                ps_dec->u4_num_mbs_cur_nmb = ps_dec->u4_num_mbs_cur_nmb - 1;
+                ps_dec->u2_cur_mb_addr--;
+            }
 
+            u1_num_mbs = ps_dec->u4_num_mbs_cur_nmb;
             if(u1_num_mbs)
             {
                 ps_cur_mb_info = ps_dec->ps_nmb_info + u1_num_mbs - 1;