commit 3d265585b3eb06ff5e62451a78abffbec2ccaa38
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Jun 13 11:58:50 2016 +0530
committer The Android Automerger <android-build@google.com> Thu Jun 23 15:48:01 2016 -0700
tree caa08fc3731238f47cf0af982ef5650fe609c033
parent dafcccb06fc5df9c6bbcfd53095c3fa45b504438

Decoder: Initialize first_pb_nal_in_pic for error slices

first_pb_nal_in_pic was uninitialized for error clips

Bug: 29023649

Change-Id: Ie4e0a94059c5f675bf619e31534846e2c2ca58ae

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index cef51b0..801960b 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1895,6 +1895,7 @@
     ps_dec->cur_dec_mb_num = 0;
     ps_dec->cur_recon_mb_num = 0;
     ps_dec->u4_first_slice_in_pic = 2;
+    ps_dec->u1_first_pb_nal_in_pic = 1;
     ps_dec->u1_slice_header_done = 0;
     ps_dec->u1_dangling_field = 0;
 

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 73bc45d..911b11d 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -940,7 +940,6 @@
     dec_slice_params_t *ps_cur_slice = ps_dec->ps_cur_slice;
     WORD32 ret;
 
-    ps_dec->u1_first_pb_nal_in_pic = 1;
     ps_dec->u2_mbx = 0xffff;
     ps_dec->u2_mby = 0;
     {