commit ac9332c9ac4d9b77ceb2a120ebf77470e85dbf3a
author Robert Shih <robertshih@google.com> Tue Jun 21 19:01:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 19:01:42 2016 +0000
tree 78955bbf9a7d2d56cd89c1d0dba6b5ae9245856b
parent 49f36805b35a5dabbb6421cabc17f90dd514c7c0
parent c4ef0f612996f7802c927d4f819752f6591b6e61

Merge \\\\"Decoder: Initialize first_pb_nal_in_pic for error slices\\\\" into mnc-dev am: b9d7cba8bf am: c73e000665 am: 59248aa67c
am: c4ef0f6129

Change-Id: I57e93af0f4f9d3f3f2d0cbbccbf21397602cc87a

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;
     {