diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-26 23:53:10 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-26 23:53:10 +0000 |
| commit | 6007a024c55d8141c478e58e77bb2f2e99b1a788 (patch) | |
| tree | c1e3211db85c6ea1f57035a85672a07bdff40483 | |
| parent | 998ab36de0d0c26524bb2eb8f3576cacf5b9ab70 (diff) | |
| parent | d81812e5352d07cc9a2cc60750885b53d8076af9 (diff) | |
| download | platform_external_libhevc-oreo-m4-s1-release.tar.gz platform_external_libhevc-oreo-m4-s1-release.tar.bz2 platform_external_libhevc-oreo-m4-s1-release.zip | |
Merge cherrypicks of [3661626, 3661980, 3662429, 3661545, 3661546, 3661579, 3661580, 3662430, 3661547, 3661548, 3661549, 3661550, 3662578, 3662579, 3662580, 3662581, 3662582, 3662583, 3661597, 3661598, 3661551, 3661552, 3661553, 3661554, 3661555, 3662596, 3662597, 3662598, 3662599, 3662584, 3662585, 3662586, 3662616, 3662617, 3662618] into oc-m4-releaseandroid-8.1.0_r23oreo-m4-s1-release
Change-Id: I4bba346f87caa42d7b94cc0acc74174d7d3d092f
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 2 | ||||
| -rwxr-xr-x | decoder/ihevcd_utils.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index a8daa3c..b8ed252 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1402,6 +1402,8 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) return IHEVCD_UNSUPPORTED_BIT_DEPTH; UEV_PARSE("log2_max_pic_order_cnt_lsb_minus4", value, ps_bitstrm); + if(value < 0 || value > 12) + return IHEVCD_INVALID_PARAMETER; ps_sps->i1_log2_max_pic_order_cnt_lsb = value + 4; BITS_PARSE("sps_sub_layer_ordering_info_present_flag", value, ps_bitstrm, 1); diff --git a/decoder/ihevcd_utils.c b/decoder/ihevcd_utils.c index 5e27885..fef3f74 100755 --- a/decoder/ihevcd_utils.c +++ b/decoder/ihevcd_utils.c @@ -736,6 +736,9 @@ IHEVCD_ERROR_T ihevcd_check_out_buf_size(codec_t *ps_codec) return (IHEVCD_ERROR_T)IHEVCD_SUCCESS; } + if(ps_codec->i4_disp_strd > (WORD32)wd) + wd = ps_codec->i4_disp_strd; + if(ps_codec->e_chroma_fmt == IV_YUV_420P) u4_min_num_out_bufs = MIN_OUT_BUFS_420; else if(ps_codec->e_chroma_fmt == IV_YUV_422ILE) |