commit fb66df40bd3587e443b2a6cca6b4d5ad0c79615f
author Naveen Kumar P <naveenkumar.p@ittiam.com> Fri Aug 04 16:42:37 2017 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 01 00:14:59 2017 +0000
tree 1710799eb6ccc7a5889c572c3d6db8ae95492489
parent 7f43ddcb27588221ada889ca1cb7010b9d0174b7

Fix incomplete frame error

Bug: 63522067
Bug: 64380403
Test: ran POC before/after
Change-Id: If22f2ed8936e0ead9fcfa64ddde99e85c10cecd2
(cherry picked from commit ee0e003a0fd2280ecd0eeecd2e2f19250a96c3af)

decoder/ihevcd_decode.c

diff --git a/decoder/ihevcd_decode.c b/decoder/ihevcd_decode.c
index 04ad8f5..44abcef 100644
--- a/decoder/ihevcd_decode.c
+++ b/decoder/ihevcd_decode.c
@@ -69,6 +69,7 @@
 #include "ihevcd_fmt_conv.h"
 #include "ihevcd_job_queue.h"
 #include "ihevcd_debug.h"
+#include "ihevcd_parse_slice.h"
 #include "ihevcd_process_slice.h"
 #include "ihevcd_ittiam_logo.h"
 #include "ihevcd_profile.h"
@@ -698,6 +699,22 @@
         return IV_FAIL;
     }
 
+    if(1 == ps_codec->i4_pic_present && 0 == ps_codec->s_parse.i4_end_of_frame)
+    {
+        slice_header_t *ps_slice_hdr_next;
+        ps_codec->i4_slice_error = 1;
+        ps_codec->s_parse.i4_cur_slice_idx--;
+        if(ps_codec->s_parse.i4_cur_slice_idx < 0)
+            ps_codec->s_parse.i4_cur_slice_idx = 0;
+
+        ps_slice_hdr_next = ps_codec->s_parse.ps_slice_hdr_base + ((ps_codec->s_parse.i4_cur_slice_idx + 1) & (MAX_SLICE_HDR_CNT - 1));
+        ps_slice_hdr_next->i2_ctb_x = -1;
+        ps_slice_hdr_next->i2_ctb_y = -1;
+
+        ihevcd_parse_slice_data(ps_codec);
+        ASSERT(ps_codec->s_parse.i4_end_of_frame != 0);
+    }
+
     if(1 == ps_codec->i4_pic_present)
     {
         WORD32 i;