commit 49f36805b35a5dabbb6421cabc17f90dd514c7c0
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Jun 21 17:44:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 17:44:01 2016 +0000
tree da3d7b92d5d3863e0ea649414ad11ff4092c3c08
parent afe52d7476664bfed80687cc472f6fbb558ad15f
parent 44a2462a71503dafecfcac46de79c5b181a59746

Decoder: Do not conceal slices with invalid SPS/PPS am: 3a419eac8d am: 48b182db5d am: ea40cf81eb
am: 44a2462a71

Change-Id: I42e0c567f5c24841a2f678ff6e2faff85c002c71

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index bcdd376..cef51b0 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2066,8 +2066,10 @@
             if((ret == IVD_RES_CHANGED)
                             || (ret == IVD_MEM_ALLOC_FAILED)
                             || (ret == ERROR_UNAVAIL_PICBUF_T)
-                            || (ret == ERROR_UNAVAIL_MVBUF_T))
+                            || (ret == ERROR_UNAVAIL_MVBUF_T)
+                            || (ret == ERROR_INV_SPS_PPS_T))
             {
+                ps_dec->u4_slice_start_code_found = 0;
                 break;
             }
 
@@ -2149,7 +2151,8 @@
     if((ret == IVD_RES_CHANGED)
                     || (ret == IVD_MEM_ALLOC_FAILED)
                     || (ret == ERROR_UNAVAIL_PICBUF_T)
-                    || (ret == ERROR_UNAVAIL_MVBUF_T))
+                    || (ret == ERROR_UNAVAIL_MVBUF_T)
+                    || (ret == ERROR_INV_SPS_PPS_T))
     {
 
         /* signal the decode thread */