commit e5137e547f496ce0801e97fc7bf04dca351fb86f
author Hamsalekha S <hamsalekha.s@ittiam.com> Tue Feb 21 16:01:02 2017 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 14 20:42:52 2018 +0000
tree 02ca8346a5ccdd93b61a34d6349fd2e8877c6d44
parent c65b8632f33f269a1a48042bde48a05dbef7382f

Bug fix for flush without valid frames

We now return fail and get out of flush mode to accept bitstream in the next call.

Bug: 35585952
Bug: 63521984
Test: test case does not hang
Change-Id: Id22cc98d4a47714475a67918990a181a805c4c9f
(cherry picked from commit 10c1176f1bb631c8b082634170da8ce2d1144d30)

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 4ed43bf..e0eafaa 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1946,8 +1946,16 @@
 
     }
 
-    if(ps_dec->u1_flushfrm && ps_dec->u1_init_dec_flag)
+    if(ps_dec->u1_flushfrm)
     {
+        if(ps_dec->u1_init_dec_flag == 0)
+        {
+            /*Come out of flush mode and return*/
+            ps_dec->u1_flushfrm = 0;
+            return (IV_FAIL);
+        }
+
+
 
         ih264d_get_next_display_field(ps_dec, ps_dec->ps_out_buffer,
                                       &(ps_dec->s_disp_op));