summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-05-24 13:11:51 -0700
committerMarco Nelissen <marcone@google.com>2016-05-25 02:25:00 +0000
commitcdfd7573ecb1e838e755d178022faa0df171df1a (patch)
tree2c177338cf767d182e287b5c65def311b7bb8bec
parenteacafb943c46399d648d0ce9ed01df7ed17686af (diff)
downloadandroid_external_libavc-cdfd7573ecb1e838e755d178022faa0df171df1a.tar.gz
android_external_libavc-cdfd7573ecb1e838e755d178022faa0df171df1a.tar.bz2
android_external_libavc-cdfd7573ecb1e838e755d178022faa0df171df1a.zip
Fix slice params for interlaced video
Bug: 28165661 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 255b4cd..8dc9daf 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1631,6 +1631,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 44ab17f..946da1d 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1497,8 +1497,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;