commit cbc8bf6e3de3cb8b9b8cb711fca87f23e7cb46e8
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 17 18:29:49 2018 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 17 18:29:49 2018 +0000
tree c1e3211db85c6ea1f57035a85672a07bdff40483
parent b415b435d97874c7b313e266476912d26ef33668
parent d799ef24822d83c849e62e3313298c4a74fece81

Snap for 4726689 from d799ef24822d83c849e62e3313298c4a74fece81 to oreo-mr1-cts-release

Change-Id: I30637892697d217341c72c115295e911691af826

decoder/ihevcd_parse_headers.c

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 @@
         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);

decoder/ihevcd_utils.c

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 @@
         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)