diff options
| author | Marco Nelissen <marcone@google.com> | 2017-02-14 23:11:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-14 23:11:03 +0000 |
| commit | 9e011993f49389de7cb7daf3baffb2b37d85717c (patch) | |
| tree | 695e55fe33847420a7162a966bd4fa88d7392643 | |
| parent | 3b1435ab03be81ed669cc7cfb98310f483000510 (diff) | |
| parent | 1d999b7cdfb58fcbf0de2210f21c3a5f8ca5cefb (diff) | |
| download | android_external_libavc-9e011993f49389de7cb7daf3baffb2b37d85717c.tar.gz android_external_libavc-9e011993f49389de7cb7daf3baffb2b37d85717c.tar.bz2 android_external_libavc-9e011993f49389de7cb7daf3baffb2b37d85717c.zip | |
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b
am: 1d999b7cdf
Change-Id: Ie8600c23f61f3300cfe31e623f8c330115a6a7ef
| -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 1403408..0bc4c3f 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -914,6 +914,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; |