diff options
| author | Marco Nelissen <marcone@google.com> | 2017-02-14 13:49:07 -0800 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-04-05 19:13:25 -0600 |
| commit | 7d6baad45c33caea663643f1912907903bbb3595 (patch) | |
| tree | b08199040c17932cd84e0b87bdb025f5adaa79b3 /decoder | |
| parent | a67236a7d1fd0e519a8009520735065de4f4fd72 (diff) | |
| download | android_external_libavc-7d6baad45c33caea663643f1912907903bbb3595.tar.gz android_external_libavc-7d6baad45c33caea663643f1912907903bbb3595.tar.bz2 android_external_libavc-7d6baad45c33caea663643f1912907903bbb3595.zip | |
resolve merge conflicts of 3654ad0 to mnc-dr-dev
Bug: 33818508
Bug: 34013472
AOSP-Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
CVE-2017-0549
Change-Id: I737d00a2c8d0729d6ef47af2049401f10ff139e4
(cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index e2b3c4b..4d64f3e 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -894,6 +894,15 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm) return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED; } + /* If MBAff is enabled, decoder support is limited to streams with + * width less than half of H264_MAX_FRAME_WIDTH. + * In case of MBAff decoder processes two rows at a time + */ + if((u2_pic_wd << ps_seq->u1_mb_aff_flag) > H264_MAX_FRAME_WIDTH) + { + return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED; + } + ps_dec->u2_disp_height = i4_cropped_ht; ps_dec->u2_disp_width = i4_cropped_wd; |