diff options
| author | Rakesh Kumar <rakesh.kumar@ittiam.com> | 2018-11-12 18:00:27 +0530 |
|---|---|---|
| committer | JP Sugarbroad <jpsugar@google.com> | 2019-01-14 16:45:27 -0800 |
| commit | 3836d99534f1d32ad6ddb6f746f0377db3b70302 (patch) | |
| tree | ddb1c47308d1e7fc379da86e93922b2d286440c8 | |
| parent | b5634fc59ecc5f13a840604ab5c29d1d9f207f47 (diff) | |
| download | android_external_libhevc-3836d99534f1d32ad6ddb6f746f0377db3b70302.tar.gz android_external_libhevc-3836d99534f1d32ad6ddb6f746f0377db3b70302.tar.bz2 android_external_libhevc-3836d99534f1d32ad6ddb6f746f0377db3b70302.zip | |
Decoder: Signal IVD_RES_CHANGED error for change in crop params
IVD_RES_CHANGED was not signaled when crop parameters changed, i.e.
display dimensions changed without change in decode dimensions.
In such cases, if output buffer was allocated as per the current
dimension being decoded, without IVD_RES_CHANGED signalled, there can be
an OOB write if the new buffer is smaller than the frame being returned
as output
Bug: 118453553
Test: vendor
Change-Id: Ic74c6fb9612403f75a8f9ddb3a93861bca82cf16
(cherry picked from commit fdbbd60bfebe48c0539897d7eeeeb5816e59ce1b)
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 58b2cfe..3f67998 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1686,6 +1686,18 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) if((0 >= disp_wd) || (0 >= disp_ht)) return IHEVCD_INVALID_PARAMETER; + if((0 != ps_codec->u4_allocate_dynamic_done) && + ((ps_codec->i4_disp_wd != disp_wd) || + (ps_codec->i4_disp_ht != disp_ht))) + { + if(0 == ps_codec->i4_first_pic_done) + { + return IHEVCD_INVALID_PARAMETER; + } + ps_codec->i4_reset_flag = 1; + return (IHEVCD_ERROR_T)IVD_RES_CHANGED; + } + ps_codec->i4_disp_wd = disp_wd; ps_codec->i4_disp_ht = disp_ht; |