diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 04:16:45 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 04:16:45 +0000 |
| commit | d799ef24822d83c849e62e3313298c4a74fece81 (patch) | |
| tree | c1e3211db85c6ea1f57035a85672a07bdff40483 | |
| parent | 22e104be79d70cadc831f01e9ab32c468256da92 (diff) | |
| parent | daaece3e79db33f6c473bb54a39933d387a9bf95 (diff) | |
| download | platform_external_libhevc-oreo-mr1-wear-release.tar.gz platform_external_libhevc-oreo-mr1-wear-release.tar.bz2 platform_external_libhevc-oreo-mr1-wear-release.zip | |
Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, 3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-releaseandroid-wear-8.1.0_r1android-8.1.0_r19oreo-mr1-wear-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testing
Change-Id: Icf89f39188c476c0f2d6e8c78d2249e44321ab05
| -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) |