wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-05-15 18:45:40 +00:00 • committed by Android (Google) Code Review
commit b0399be998
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
decoder/ih264d_parse_headers.c
View file

@ -565,6 +565,23 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
ps_seq = ps_dec->pv_scratch_sps_pps; ps_seq = ps_dec->pv_scratch_sps_pps;
*ps_seq = ps_dec->ps_sps[u1_seq_parameter_set_id]; *ps_seq = ps_dec->ps_sps[u1_seq_parameter_set_id];
if(NULL == ps_dec->ps_cur_sps)
ps_dec->ps_cur_sps = ps_seq;
if((ps_dec->i4_header_decoded & 1) && (ps_seq->u1_profile_idc != u1_profile_idc))
{
ps_dec->u1_res_changed = 1;
return IVD_RES_CHANGED;
}
if((ps_dec->i4_header_decoded & 1) && (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_profile_idc = u1_profile_idc;
ps_seq->u1_level_idc = u1_level_idc; ps_seq->u1_level_idc = u1_level_idc;
ps_seq->u1_seq_parameter_set_id = u1_seq_parameter_set_id; ps_seq->u1_seq_parameter_set_id = u1_seq_parameter_set_id;
@ -731,6 +748,14 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
{ {
return ERROR_NUM_REF; return ERROR_NUM_REF;
} }
/* Compare with older num_ref_frames is header is already once */
if((ps_dec->i4_header_decoded & 1) && (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; ps_seq->u1_num_ref_frames = u4_temp;
if(ps_seq->u1_num_ref_frames > ps_dec->u4_num_ref_frames_at_init) if(ps_seq->u1_num_ref_frames > ps_dec->u4_num_ref_frames_at_init)
@ -924,12 +949,12 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
return ERROR_INV_SPS_PPS_T; return ERROR_INV_SPS_PPS_T;
} }
if((3 == ps_dec->i4_header_decoded) && (ps_dec->u2_pic_wd != u2_pic_wd)) if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_pic_wd != u2_pic_wd))
{ {
ps_dec->u1_res_changed = 1; ps_dec->u1_res_changed = 1;
return IVD_RES_CHANGED; return IVD_RES_CHANGED;
} }
if((3 == ps_dec->i4_header_decoded) && (ps_dec->u2_pic_ht != u2_pic_ht)) if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_pic_ht != u2_pic_ht))
{ {
ps_dec->u1_res_changed = 1; ps_dec->u1_res_changed = 1;
return IVD_RES_CHANGED; return IVD_RES_CHANGED;
@ -963,6 +988,7 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
return ret; return ret;
} }
if(ps_dec->u4_level_at_init < u1_level_idc) if(ps_dec->u4_level_at_init < u1_level_idc)
{ {
UWORD32 u4_num_pic_bufs_reqd, u4_num_reorder_frames, UWORD32 u4_num_pic_bufs_reqd, u4_num_reorder_frames,