commit 9bdef7572fe81a54e7a0cb273a661c9aac54488f
author Marco Nelissen <marcone@google.com> Tue Mar 21 14:18:45 2017 -0700
committer Badash <badash@google.com> Wed Mar 22 11:57:50 2017 -0700
tree c7514eb9f311a6794b5f143549f4f30d4cfc0946
parent c0d5dc5589b4a67d9e157714f6b8737ec6babe11

Fixing a check in ih264d_parse_slice.c

This was a regression introduced by improper ordering of commits.
Bug: 36294244
Bug: 36403462
Bug: 36323193
Bug: 36461857
Change-Id: Ie995dade52323ae752ac381c523b95f8e1170b37

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 1489243..f755970 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1123,7 +1123,7 @@
 
     COPYTHECONTEXT("SH: frame_num", u2_frame_num);
 //    H264_DEC_DEBUG_PRINT("Second field: %d frame num: %d prv_frame_num: %d \n", ps_dec->u1_second_field, u2_frame_num, ps_dec->u2_prv_frame_num);
-    if(!ps_dec->u1_first_slice_in_stream && (ps_dec->u4_first_slice_in_pic == 2))
+    if(!ps_dec->u1_first_slice_in_stream && ps_dec->u4_first_slice_in_pic)
     {
         pocstruct_t *ps_prev_poc = &ps_dec->s_prev_pic_poc;
         pocstruct_t *ps_cur_poc = &ps_dec->s_cur_pic_poc;
@@ -1263,7 +1263,7 @@
     i1_is_end_of_poc = 1;
     ps_dec->ps_dec_err_status->u1_err_flag &= MASK_REJECT_CUR_PIC;
 
-    if(ps_dec->u4_first_slice_in_pic != 2)
+    if(ps_dec->u4_first_slice_in_pic == 0)
     {
         i1_is_end_of_poc = ih264d_is_end_of_pic(u2_frame_num, u1_nal_ref_idc,
                                             &s_tmp_poc, &ps_dec->s_cur_pic_poc,