diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-23 22:29:03 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-23 22:29:03 +0000 |
| commit | 2b9fa38bb85b951b86e04246a6b0a70c6eb044da (patch) | |
| tree | 34d82cce4852be747369bdfafa393d732a02685e /decoder | |
| parent | fea57ee069f595501d0c15da7dcbe01edc6a8874 (diff) | |
| parent | 1561dc0fa99738b827de96fe24c996d6592a1b97 (diff) | |
| download | libhevc-2b9fa38bb85b951b86e04246a6b0a70c6eb044da.tar.gz | |
[automerger] Add missing return check for short_term_ref_pic_set() am: 299cceb9e4 am: 2e8ae23656 am: 7ecb4083b9 am: 4fe71a567e am: 1561dc0fa9
Change-Id: I378a6e4f6f70931f36fd74acb02846096679e367
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 8 | ||||
| -rw-r--r-- | decoder/ihevcd_parse_slice_header.c | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 3f67998..c7e147d 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1565,7 +1565,13 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) ps_sps->i1_num_short_term_ref_pic_sets = value; 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); ps_sps->i1_long_term_ref_pics_present_flag = value; diff --git a/decoder/ihevcd_parse_slice_header.c b/decoder/ihevcd_parse_slice_header.c index 70998f7..2ef174c 100644 --- a/decoder/ihevcd_parse_slice_header.c +++ b/decoder/ihevcd_parse_slice_header.c @@ -436,12 +436,15 @@ IHEVCD_ERROR_T ihevcd_parse_slice_header(codec_t *ps_codec, } else { - ihevcd_short_term_ref_pic_set(ps_bitstrm, - &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_slice_hdr->s_stref_picset); - + ret = ihevcd_short_term_ref_pic_set(ps_bitstrm, + &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_slice_hdr->s_stref_picset); + if (ret != IHEVCD_SUCCESS) + { + return ret; + } 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_pos_pics = ps_slice_hdr->s_stref_picset.i1_num_pos_pics; |