diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-05-25 23:10:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 23:10:36 +0000 |
| commit | b70297ef4b97b25696535d0032b3d371674f77bc (patch) | |
| tree | bd680df3086123de70e0a839c2faee78f30f914b | |
| parent | 8f5faccce9312e6757cc27600228b3f8ef653257 (diff) | |
| parent | 2c9d67ffafeb28209732dff36d1e5a5792645d23 (diff) | |
| download | android_external_libavc-b70297ef4b97b25696535d0032b3d371674f77bc.tar.gz android_external_libavc-b70297ef4b97b25696535d0032b3d371674f77bc.tar.bz2 android_external_libavc-b70297ef4b97b25696535d0032b3d371674f77bc.zip | |
Fix slice params for interlaced video
am: 2c9d67ffaf
* commit '2c9d67ffafeb28209732dff36d1e5a5792645d23':
Fix slice params for interlaced video
Change-Id: I51d4b19e7eed44dde54e030e3432038dabd8e213
| -rw-r--r-- | decoder/ih264d_api.c | 1 | ||||
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 2 |
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; |