wrapper/libhevc-mirror
1
0
Fork 0
mirror of https://github.com/ittiam-systems/libhevc.git synced 2026-08-15 15:22:36 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[automerger] Add missing return check for short_term_ref_pic_set() am: 299cceb9e4 am: 2e8ae23656 am: 7ecb4083b9 am: 4fe71a567e am: 1561dc0fa9 am: 2b9fa38bb8

Browse source 
am: 6e96227190

Change-Id: I9e0ce7d648ccbe292f7072b30aa8c3b768baa092
This commit is contained in:
Harish Mahendrakar 2019-05-06 16:39:34 -07:00 • committed by android-build-merger
commit cd5ac287ce
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
decoder/ihevcd_parse_headers.c
View file

@ -1565,7 +1565,13 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
ps_sps->i1_num_short_term_ref_pic_sets = value; ps_sps->i1_num_short_term_ref_pic_sets = value;
for(i = 0; i < ps_sps->i1_num_short_term_ref_pic_sets; i++) for(i = 0; i < ps_sps->i1_num_short_term_ref_pic_sets; i++)
ihevcd_short_term_ref_pic_set(ps_bitstrm, &ps_sps->as_stref_picset[0], ps_sps->i1_num_short_term_ref_pic_sets, i, &ps_sps->as_stref_picset[i]); {
ret = ihevcd_short_term_ref_pic_set(ps_bitstrm, &ps_sps->as_stref_picset[0], ps_sps->i1_num_short_term_ref_pic_sets, i, &ps_sps->as_stref_picset[i]);
if (ret != IHEVCD_SUCCESS)
{
return ret;
}
}
BITS_PARSE("long_term_ref_pics_present_flag", value, ps_bitstrm, 1); BITS_PARSE("long_term_ref_pics_present_flag", value, ps_bitstrm, 1);
ps_sps->i1_long_term_ref_pics_present_flag = value; ps_sps->i1_long_term_ref_pics_present_flag = value;

15
decoder/ihevcd_parse_slice_header.c
View file

@ -436,12 +436,15 @@ IHEVCD_ERROR_T ihevcd_parse_slice_header(codec_t *ps_codec,
} }
else else
{ {
ihevcd_short_term_ref_pic_set(ps_bitstrm, ret = ihevcd_short_term_ref_pic_set(ps_bitstrm,
&ps_sps->as_stref_picset[0], &ps_sps->as_stref_picset[0],
ps_sps->i1_num_short_term_ref_pic_sets, ps_sps->i1_num_short_term_ref_pic_sets,
ps_sps->i1_num_short_term_ref_pic_sets, ps_sps->i1_num_short_term_ref_pic_sets,
&ps_slice_hdr->s_stref_picset); &ps_slice_hdr->s_stref_picset);
if (ret != IHEVCD_SUCCESS)
{
return ret;
}
st_rps_idx = ps_sps->i1_num_short_term_ref_pic_sets; st_rps_idx = ps_sps->i1_num_short_term_ref_pic_sets;
num_neg_pics = ps_slice_hdr->s_stref_picset.i1_num_neg_pics; num_neg_pics = ps_slice_hdr->s_stref_picset.i1_num_neg_pics;
num_pos_pics = ps_slice_hdr->s_stref_picset.i1_num_pos_pics; num_pos_pics = ps_slice_hdr->s_stref_picset.i1_num_pos_pics;