diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-04-17 18:29:49 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-04-17 18:29:49 +0000 |
| commit | cbc8bf6e3de3cb8b9b8cb711fca87f23e7cb46e8 (patch) | |
| tree | c1e3211db85c6ea1f57035a85672a07bdff40483 | |
| parent | b415b435d97874c7b313e266476912d26ef33668 (diff) | |
| parent | d799ef24822d83c849e62e3313298c4a74fece81 (diff) | |
| download | platform_external_libhevc-oreo-mr1-cts-release.tar.gz platform_external_libhevc-oreo-mr1-cts-release.tar.bz2 platform_external_libhevc-oreo-mr1-cts-release.zip | |
Snap for 4726689 from d799ef24822d83c849e62e3313298c4a74fece81 to oreo-mr1-cts-releaseandroid-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10oreo-mr1-cts-release
Change-Id: I30637892697d217341c72c115295e911691af826
| -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) |