DO NOT MERGE Handle level/profile/num_ref_frames/num_reorder change at the same resolution Cherry pick of Change-Id: Ifa78c3125ab207ce5e39166f4891cba0d3a4e39c which went into master (post-n). This needed backporting to M so that the final fix for 35583675 could be integrated. Bug: 35583675 Test: ran POC without failure Change-Id: I0d248212aaf6635f34a70ad36657416a0c623d32 (cherry picked from commit 142221a3f993adca0c7db7f4b65d76cd9fd72a38)
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index ba32225..3807a14 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c
@@ -496,7 +496,7 @@ UWORD32 u2_crop_offset_y = 0; UWORD32 u2_crop_offset_uv = 0; WORD32 ret; - + UWORD32 u4_num_reorder_frames; /* High profile related syntax element */ WORD32 i4_i; /* G050 */ @@ -569,6 +569,18 @@ if(NULL == ps_dec->ps_cur_sps) ps_dec->ps_cur_sps = ps_seq; + if((3 == ps_dec->i4_header_decoded) && (ps_seq->u1_profile_idc != u1_profile_idc)) + { + ps_dec->u1_res_changed = 1; + return IVD_RES_CHANGED; + } + + if((3 == ps_dec->i4_header_decoded) && (ps_seq->u1_level_idc != u1_level_idc)) + { + ps_dec->u1_res_changed = 1; + return IVD_RES_CHANGED; + } + ps_seq->u1_profile_idc = u1_profile_idc; ps_seq->u1_level_idc = u1_level_idc; ps_seq->u1_seq_parameter_set_id = u1_seq_parameter_set_id; @@ -735,6 +747,14 @@ { return ERROR_NUM_REF; } + + /* Compare with older num_ref_frames is header is already once */ + if((3 == ps_dec->i4_header_decoded) && (ps_seq->u1_num_ref_frames != u4_temp)) + { + ps_dec->u1_res_changed = 1; + return IVD_RES_CHANGED; + } + ps_seq->u1_num_ref_frames = u4_temp; COPYTHECONTEXT("SPS: num_ref_frames",ps_seq->u1_num_ref_frames); @@ -911,6 +931,17 @@ } + /* Backup u4_num_reorder_frames if header is already decoded */ + if((3 == ps_dec->i4_header_decoded) && + (1 == ps_seq->u1_vui_parameters_present_flag) && + (1 == ps_seq->s_vui.u1_bitstream_restriction_flag)) + { + u4_num_reorder_frames = ps_seq->s_vui.u4_num_reorder_frames; + } + else + { + u4_num_reorder_frames = -1; + } if(1 == ps_seq->u1_vui_parameters_present_flag) { ret = ih264d_parse_vui_parametres(&ps_seq->s_vui, ps_bitstrm); @@ -918,6 +949,17 @@ return ret; } + /* Compare older u4_num_reorder_frames with the new one if header is already decoded */ + if((3 == ps_dec->i4_header_decoded) && + (-1 != (WORD32)u4_num_reorder_frames) && + (1 == ps_seq->u1_vui_parameters_present_flag) && + (1 == ps_seq->s_vui.u1_bitstream_restriction_flag) && + (ps_seq->s_vui.u4_num_reorder_frames != u4_num_reorder_frames)) + { + ps_dec->u1_res_changed = 1; + return IVD_RES_CHANGED; + } + ps_dec->u2_pic_wd = u2_pic_wd; ps_dec->u2_pic_ht = u2_pic_ht;