diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2015-07-31 14:24:48 +0530 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-09-01 19:05:40 -0700 |
| commit | 5be354010153023d020cc4d833de274e455ffbb4 (patch) | |
| tree | 4eb3c67ac2142685c3314892fb07c5a2f391ebcc | |
| parent | a90d9a91923f2980c49ec34b805e7a910979f96a (diff) | |
| download | platform_external_libhevc-lollipop-mr1-fi-release.tar.gz platform_external_libhevc-lollipop-mr1-fi-release.tar.bz2 platform_external_libhevc-lollipop-mr1-fi-release.zip | |
Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8android-5.1.1_r29android-5.1.1_r23lollipop-mr1-fi-release
Spec mandates these to be multiples of min_cb_size.
Bug fix: 22278703
Change-Id: I17f0c2242519a9277598b8fb5b05717e1ce7469b
(cherry picked from commit dde3d8a3c7638dcc024ce25fdab420703a53f16b)
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 2f84d12..00fc9cb 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1257,6 +1257,12 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) if((0 >= ps_sps->i2_pic_width_in_luma_samples) || (0 >= ps_sps->i2_pic_height_in_luma_samples)) return IHEVCD_INVALID_PARAMETER; + /* i2_pic_width_in_luma_samples and i2_pic_height_in_luma_samples + should be multiples of min_cb_size. Here these are aligned to 8, + i.e. smallest CB size */ + ps_sps->i2_pic_width_in_luma_samples = ALIGN8(ps_sps->i2_pic_width_in_luma_samples); + ps_sps->i2_pic_height_in_luma_samples = ALIGN8(ps_sps->i2_pic_height_in_luma_samples); + if((ps_sps->i2_pic_width_in_luma_samples > ps_codec->i4_max_wd) || (ps_sps->i2_pic_width_in_luma_samples * ps_sps->i2_pic_height_in_luma_samples > ps_codec->i4_max_wd * ps_codec->i4_max_ht) || |