diff options
| author | Marco Nelissen <marcone@google.com> | 2017-02-14 22:55:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-14 22:55:05 +0000 |
| commit | 33d9d00a3c221e9b618856a15742cfbe68b83eb9 (patch) | |
| tree | 18bc7275acfac00b0f2a294c2180f0203408e686 | |
| parent | ab79eb397383b079df9c9ef0cf8aa24cad8480ab (diff) | |
| parent | 37345554fea84afd446d6d8fbb87feea5a0dde3f (diff) | |
| download | libavc-33d9d00a3c221e9b618856a15742cfbe68b83eb9.tar.gz | |
resolve merge conflicts of 3654ad0 to mnc-dr-dev
am: 37345554fe
Change-Id: I7117544d1e2c909e353b7df3c42cfc25a9919ecf
| -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 859c9b3..bc4ace4 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; |