commit ca5a94f122bddcc0cfec0073f66b79613f05de41
author Marco Nelissen <marcone@google.com> Tue Feb 14 13:49:07 2017 -0800
committer Feng Yu <feny@google.com> Wed Feb 15 07:21:59 2017 +0000
tree 410f7f765b7b88c1af53e969b38afabf659d337c
parent 9b25a2bc3ed6b82977ec95f46e91b3e5d050dec5

resolve merge conflicts of 3654ad0 to mnc-dr-dev

Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
(cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)

decoder/ih264d_parse_headers.c

diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index e2b3c4b..4d64f3e 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -894,6 +894,15 @@
             return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED;
         }
 
+        /* If MBAff is enabled, decoder support is limited to streams with
+         * width less than half of H264_MAX_FRAME_WIDTH.
+         * In case of MBAff decoder processes two rows at a time
+         */
+        if((u2_pic_wd << ps_seq->u1_mb_aff_flag) > H264_MAX_FRAME_WIDTH)
+        {
+            return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED;
+        }
+
         ps_dec->u2_disp_height = i4_cropped_ht;
 
         ps_dec->u2_disp_width = i4_cropped_wd;