Fix slice params for interlaced video am: 2c9d67ffaf am: b70297ef4b

am: 4abe7805da

* commit '4abe7805da':
  Fix slice params for interlaced video

Change-Id: Ie82a2a710d461fa6a2192d3d63741b4eeb2b8ce0
This commit is contained in:
Harish Mahendrakar 2016-05-26 00:17:40 +00:00 committed by android-build-merger
commit 64e6a63272
2 changed files with 1 additions and 2 deletions

View file

@ -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);

View file

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