commit 822fdabdb5523ded58a3c7ef10396db5ca07cd12
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 10 23:01:44 2018 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 10 23:01:44 2018 +0000
tree 01ce6bda9284323729579168954a34a8286d4096
parent fbcb30a0a10b8537d497fa65a82aff06a21d80e5
parent 0638789f406b365cfa293da194c8f1c4eeb10bc1

Snap for 4711598 from 0638789f406b365cfa293da194c8f1c4eeb10bc1 to oreo-mr1-vts-release

Change-Id: If61e0ce192ab9fa3a4425e3fac816054656b9b3e

decoder/ih264d_parse_headers.c

diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index f0d0d88..03ed508 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -30,6 +30,8 @@
  * \author  AI
  **************************************************************************
  */
+#include <string.h>
+
 #include "ih264_typedefs.h"
 #include "ih264_macros.h"
 #include "ih264_platform_macros.h"
@@ -564,6 +566,8 @@
     /*--------------------------------------------------------------------*/
 
     ps_seq = ps_dec->pv_scratch_sps_pps;
+    memset(ps_seq, 0, sizeof(dec_seq_params_t));
+
     if(ps_dec->i4_header_decoded & 1)
     {
         *ps_seq = *ps_dec->ps_cur_sps;

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 609c2fe..db02bfe 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1826,7 +1826,7 @@
         ps_dec->ps_cur_pic->u4_pack_slc_typ |= I_SLC_BIT;
 
         ret = ih264d_parse_islice(ps_dec, u2_first_mb_in_slice);
-
+        ps_dec->u1_pr_sl_type = u1_slice_type;
         if(ps_dec->i4_pic_type != B_SLICE && ps_dec->i4_pic_type != P_SLICE)
             ps_dec->i4_pic_type = I_SLICE;