commit 7950bf47b6944546a0aff11a7184947de9591b51
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Dec 15 18:04:53 2016 +0530
committer Ray Essick <essick@google.com> Mon Feb 13 19:14:18 2017 +0000
tree aac602980a2d20094f760c71a6cabe71acf10be3
parent 43a184ad481e2346f03f1398af74c04a3bb46e4d

Fix in returning end of bitstream error for MBAFF

In case of MBAFF streams, slices should terminate on
even MB boundary. If bytes are exhausted with odd number
of MBs decoded for MBAff, then treat that as error.

Bug: 33933140

Change-Id: Ifc26b66ff8ebdb3aec5c0d6c512e4cac3f54c5b7

decoder/ih264d_parse_islice.c

diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c
index bbb6110..768bc74 100644
--- a/decoder/ih264d_parse_islice.c
+++ b/decoder/ih264d_parse_islice.c
@@ -870,6 +870,10 @@
         if(u1_mbaff)
         {
             ih264d_update_mbaff_left_nnz(ps_dec, ps_cur_mb_info);
+            if(!uc_more_data_flag && (0 == (i2_cur_mb_addr & 1)))
+            {
+                return ERROR_EOB_FLUSHBITS_T;
+            }
         }
         /**************************************************************/
         /* Get next Macroblock address                                */

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index a33a03f..bd7eacb 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1350,6 +1350,10 @@
         if(u1_mbaff)
         {
             ih264d_update_mbaff_left_nnz(ps_dec, ps_cur_mb_info);
+            if(!uc_more_data_flag && !i2_mb_skip_run && (0 == (i2_cur_mb_addr & 1)))
+            {
+                return ERROR_EOB_FLUSHBITS_T;
+            }
         }
         /**************************************************************/
         /* Get next Macroblock address                                */