diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-04-26 16:36:03 +0530 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2017-02-14 04:41:02 +0000 |
| commit | 8b5fd8f24eba5dd19ab2f80ea11a9125aa882ae2 (patch) | |
| tree | 6e4413e441471558f747e2c21fc16cb414d2cfa0 /decoder/ih264d_parse_slice.c | |
| parent | 1f0ab0b089e357da4ecfec4f105726bfc23af5a0 (diff) | |
| download | libavc-8b5fd8f24eba5dd19ab2f80ea11a9125aa882ae2.tar.gz | |
Decoder: Treat first slice in a picture as part of new picture always
This is needed to decode streams with consecutive IDRs.
Bug: 34097231
Test: successful run of POC in security bug
Change-Id: Ib737a4ef4b8c5bb7a57c90292102dd28af0615fe
Diffstat (limited to 'decoder/ih264d_parse_slice.c')
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index 6ac55aa..c76e186 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1273,8 +1273,11 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, /*--------------------------------------------------------------------*/ /* Check if the slice is part of new picture */ /*--------------------------------------------------------------------*/ - i1_is_end_of_poc = 0; - if(!ps_dec->u1_first_slice_in_stream) + /* First slice of a picture is always considered as part of new picture */ + 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) { 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, @@ -1282,23 +1285,6 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, u1_nal_unit_type, u4_idr_pic_id, u1_field_pic_flag, u1_bottom_field_flag); - - /* since we support only Full frame decode, every new process should - * process a new pic - */ - if((ps_dec->u4_first_slice_in_pic == 2) && (i1_is_end_of_poc == 0)) - { - /* if it is the first slice is process call ,it should be a new frame. If it is not - * reject current pic and dont add it to dpb - */ - ps_dec->ps_dec_err_status->u1_err_flag |= REJECT_CUR_PIC; - i1_is_end_of_poc = 1; - } - else - { - /* reset REJECT_CUR_PIC */ - ps_dec->ps_dec_err_status->u1_err_flag &= MASK_REJECT_CUR_PIC; - } } /*--------------------------------------------------------------------*/ |