summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-05-24 13:11:51 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-07 09:42:04 -0700
commitd444647df03673c9309d8a6fe2b81ae4a20a5f65 (patch)
treebd680df3086123de70e0a839c2faee78f30f914b
parenta52b5f6890479576333de325be20c29e829122e7 (diff)
downloadandroid_external_libavc-d444647df03673c9309d8a6fe2b81ae4a20a5f65.tar.gz
android_external_libavc-d444647df03673c9309d8a6fe2b81ae4a20a5f65.tar.bz2
android_external_libavc-d444647df03673c9309d8a6fe2b81ae4a20a5f65.zip
Fix slice params for interlaced video
Bug: 28165661 Ticket: CYNGNOS-3020 Change-Id: I912a86bd78ebf0617fd2bc6eb2b5a61afc17bf53
-rw-r--r--decoder/ih264d_api.c1
-rw-r--r--decoder/ih264d_parse_pslice.c2
2 files changed, 1 insertions, 2 deletions
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 @@ void ih264d_init_decoder(void * ps_dec_params)
(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);
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 1127838..a751a88 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1495,8 +1495,6 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
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;