From 0b23c81c3dd9ec38f7e6806a3955fed1925541a0 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Mon, 16 Jan 2017 14:43:42 +0530 Subject: [PATCH] Decoder: Fixed initialization of first_slice_in_pic To handle some errors, first_slice_in_pic was being set to 2. This is now cleaned up and first_slice_in_pic is set to 1 only once per pic. This will ensure picture level initializations are done only once even in case of error clips Bug: 33717589 Bug: 33551775 Bug: 33716442 Bug: 33677995 Change-Id: If341436b3cbaa724017eedddd88c2e6fac36d8ba --- decoder/ih264d_api.c | 2 +- decoder/ih264d_parse_headers.c | 7 ------- decoder/ih264d_parse_pslice.c | 1 - decoder/ih264d_parse_slice.c | 38 +++++++++++----------------------- 4 files changed, 13 insertions(+), 35 deletions(-) diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 04212dc..27f4ad0 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2870,7 +2870,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) ps_dec->u2_cur_slice_num = 0; ps_dec->cur_dec_mb_num = 0; ps_dec->cur_recon_mb_num = 0; - ps_dec->u4_first_slice_in_pic = 2; + ps_dec->u4_first_slice_in_pic = 1; ps_dec->u1_first_pb_nal_in_pic = 1; ps_dec->u1_slice_header_done = 0; ps_dec->u1_dangling_field = 0; diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index 7b0bdcb..01aae43 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -1151,13 +1151,6 @@ WORD32 ih264d_parse_nal_unit(iv_obj_t *dec_hdl, == IDR_SLICE_NAL), u1_nal_ref_idc, ps_dec); - if((ps_dec->u4_first_slice_in_pic != 0)&& - ((ps_dec->ps_dec_err_status->u1_err_flag & REJECT_CUR_PIC) == 0)) - { - /* if the first slice header was not valid set to 1 */ - ps_dec->u4_first_slice_in_pic = 1; - } - if(i_status != OK) { return i_status; diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index 72064ed..ae002f0 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1568,7 +1568,6 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec, } } } - ps_dec->u4_first_slice_in_pic = 0; } else { diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index a7c84a9..1cea310 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -737,6 +737,7 @@ WORD32 ih264d_start_of_pic(dec_struct_t *ps_dec, ps_dec->u4_deblk_mb_y = 0; ps_dec->pu4_wt_ofsts = ps_dec->pu4_wts_ofsts_mat; + ps_dec->u4_first_slice_in_pic = 0; H264_MUTEX_UNLOCK(&ps_dec->process_disp_mutex); return OK; } @@ -1136,7 +1137,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, COPYTHECONTEXT("SH: frame_num", u2_frame_num); // H264_DEC_DEBUG_PRINT("Second field: %d frame num: %d prv_frame_num: %d \n", ps_dec->u1_second_field, u2_frame_num, ps_dec->u2_prv_frame_num); - if(!ps_dec->u1_first_slice_in_stream && (ps_dec->u4_first_slice_in_pic == 2)) + if(!ps_dec->u1_first_slice_in_stream && ps_dec->u4_first_slice_in_pic) { pocstruct_t *ps_prev_poc = &ps_dec->s_prev_pic_poc; pocstruct_t *ps_cur_poc = &ps_dec->s_cur_pic_poc; @@ -1276,7 +1277,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, i1_is_end_of_poc = 1; ps_dec->ps_dec_err_status->u1_err_flag &= MASK_REJECT_CUR_PIC; - if(ps_dec->u4_first_slice_in_pic != 2) + if(ps_dec->u4_first_slice_in_pic == 0) { i1_is_end_of_poc = ih264d_is_end_of_pic(u2_frame_num, u1_nal_ref_idc, &s_tmp_poc, &ps_dec->s_cur_pic_poc, @@ -1329,7 +1330,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, u1_is_idr_slice = ps_cur_slice->u1_nal_unit_type == IDR_SLICE_NAL; } - else if(ps_dec->u4_first_slice_in_pic == 2) + else if(ps_dec->u4_first_slice_in_pic) { if(u2_first_mb_in_slice > 0) { @@ -1354,25 +1355,12 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, } else { - - if(ps_dec->u4_first_slice_in_pic) - { - /* if valid slice header is not decoded do start of pic processing - * since in the current process call, frame num is not updated in the slice structure yet - * ih264d_is_end_of_pic is checked with valid frame num of previous process call, - * although i1_is_end_of_poc is set there could be more slices in the frame, - * so conceal only till cur slice */ - prev_slice_err = 1; - num_mb_skipped = u2_first_mb_in_slice << u1_mbaff; - } - else - { - /* since i1_is_end_of_poc is set ,means new frame num is encountered. so conceal the current frame - * completely */ - prev_slice_err = 2; - num_mb_skipped = (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs) - - ps_dec->u2_total_mbs_coded; - } + /* since i1_is_end_of_poc is set ,means new frame num is encountered. so conceal the current frame + * completely */ + prev_slice_err = 2; + num_mb_skipped = (ps_dec->u2_frm_ht_in_mbs + * ps_dec->u2_frm_wd_in_mbs) + - ps_dec->u2_total_mbs_coded; ps_cur_poc = &s_tmp_poc; } } @@ -1475,7 +1463,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, ps_dec->ps_cur_pic->i4_poc = i4_temp_poc; ps_dec->ps_cur_pic->i4_avg_poc = i4_temp_poc; } - if(ps_dec->u4_first_slice_in_pic == 2) + if(ps_dec->u4_first_slice_in_pic) { ret = ih264d_decode_pic_order_cnt(u1_is_idr_slice, u2_frame_num, &ps_dec->s_prev_pic_poc, @@ -1543,7 +1531,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, ps_dec->pf_mvpred = ih264d_mvpred_nonmbaff; } - if(ps_dec->u4_first_slice_in_pic == 2) + if(ps_dec->u4_first_slice_in_pic) { if(u2_first_mb_in_slice == 0) { @@ -1863,8 +1851,6 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, if(ps_dec->u1_slice_header_done) { /* set to zero to indicate a valid slice has been decoded */ - /* first slice header successfully decoded */ - ps_dec->u4_first_slice_in_pic = 0; ps_dec->u1_first_slice_in_stream = 0; }