diff options
author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2015-10-06 09:03:25 +0530 |
---|---|---|
committer | Ronghua Wu <ronghuawu@google.com> | 2015-10-13 23:28:19 +0000 |
commit | 5351d3a403c132d2dff1288d0794f6c15d695849 (patch) | |
tree | c197dd48d0dd435bbc03d5bf888a210e336a7fb1 | |
parent | 126d84e0d3b6f3cb3a6e89f85da070e39ac51219 (diff) | |
download | android_external_libavc-5351d3a403c132d2dff1288d0794f6c15d695849.tar.gz android_external_libavc-5351d3a403c132d2dff1288d0794f6c15d695849.tar.bz2 android_external_libavc-5351d3a403c132d2dff1288d0794f6c15d695849.zip |
Decoder: Added a check for unsupported resolutions
Decoder now returns an error for resolutions greater than 3840x2176
Bug: 24542936
Change-Id: I38be0e4c5cf2a980bfd4c781f3b49171f73b5ccb
-rw-r--r-- | decoder/ih264d_parse_headers.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index fc88afc..1a96fdf 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -892,6 +892,12 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm) return IVD_RES_CHANGED; } + /* Check for unsupported resolutions */ + if((u2_pic_wd > H264_MAX_FRAME_WIDTH) || (u2_pic_ht > H264_MAX_FRAME_HEIGHT)) + { + return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED; + } + ps_dec->u2_disp_height = i4_cropped_ht; ps_dec->u2_disp_width = i4_cropped_wd; |