commit a09b16ba37a8571e796479b34996a4b18b371d8d
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue May 24 13:11:51 2016 -0700
committer The Android Automerger <android-build@google.com> Fri May 27 10:27:21 2016 -0700
tree 960ea8167672017f1724c2f97a15ab56c1771ecd
parent 67c4732f5bd7eed8882e95c94d7df7ea7af23ded

Fix slice params for interlaced video

Bug: 28165661
Change-Id: I912a86bd78ebf0617fd2bc6eb2b5a61afc17bf53

decoder/ih264d_api.c

diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 82226f3..e2fa322 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1103,6 +1103,7 @@
            (MAX_DISP_BUFS_NEW) * sizeof(UWORD32));
     memset(ps_dec->u4_disp_buf_to_be_freed, 0,
            (MAX_DISP_BUFS_NEW) * sizeof(UWORD32));
+    memset(ps_dec->ps_cur_slice, 0, sizeof(dec_slice_params_t));
 
     ih264d_init_arch(ps_dec);
     ih264d_init_function_ptr(ps_dec);

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 5f6f63f..a589d84 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1495,8 +1495,6 @@
                        j = i;
             {
                 //initialize slice params required by ih264d_start_of_pic to valid values
-                ps_dec->ps_cur_slice->u1_bottom_field_flag = 0;
-                ps_dec->ps_cur_slice->u1_field_pic_flag = 0;
                 ps_dec->ps_cur_slice->u1_slice_type = P_SLICE;
                 ps_dec->ps_cur_slice->u1_nal_ref_idc = 1;
                 ps_dec->ps_cur_slice->u1_nal_unit_type = 1;