commit f693c6b59fb921efb8b7fb150a1b86f19501bbb1
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Dec 20 12:16:31 2016 +0530
committer gitbuildkicker <android-build@google.com> Fri Jan 27 13:44:11 2017 -0800
tree b57454aa011a61227c0bdaf6c6c13607efec1c30
parent bd6cf42295858f1d5a608e9eedaab29ed56820eb

Decoder: Fix in returning incomplete frame error

In case a slice start code is found and picture decode is not complete
and a non slice NAL is encountered, then mark the current pic as incomplete

Bug: 33250932
Bug: 33139050

Change-Id: I9db4446338b307310805dba90c60c8cbdeee0739
(cherry picked from commit d1896deaf15ad8c6d148702899426b64601a3358)

decoder/ih264d_parse_headers.c

diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index b9eb0bc..e2b3c4b 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -1036,7 +1036,9 @@
             u1_nal_unit_type = NAL_UNIT_TYPE(u1_first_byte);
             // if any other nal unit other than slice nal is encountered in between a
             // frame break out of loop without consuming header
-            if((ps_dec->u2_total_mbs_coded != 0) && (u1_nal_unit_type > IDR_SLICE_NAL))
+            if ((ps_dec->u4_slice_start_code_found == 1)
+                    && (ps_dec->u1_pic_decode_done != 1)
+                    && (u1_nal_unit_type > IDR_SLICE_NAL))
             {
                 return ERROR_INCOMPLETE_FRAME;
             }