generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix alignment in vpx_image without external allocation.

Browse Source 
This restores behaviors prior to
<40c8fde Fix image width alignment. Enable ImageSizeSetting test.>.

BUG=b/64710201

Change-Id: I559557afe80d5ff5ea6ac24021561715068e7786
This commit is contained in:
Jerome Jiang 2017-10-09 19:33:03 -07:00
parent e1ae3772da
commit 33c598990b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vpx/src/vpx_image.c
View File

@ -112,10 +112,10 @@ static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt,
if (!img_data) {
uint64_t alloc_size;
/* Calculate storage sizes given the chroma subsampling */
align = xcs ? (1 << xcs) - 1 : 1;
w = (d_w + align - 1) & ~(align - 1);
align = ycs ? (1 << ycs) - 1 : 1;
h = (d_h + align - 1) & ~(align - 1);
align = (1 << xcs) - 1;
w = (d_w + align) & ~align;
align = (1 << ycs) - 1;
h = (d_h + align) & ~align;
s = (fmt & VPX_IMG_FMT_PLANAR) ? w : bps * w / 8;
s = (s + stride_align - 1) & ~(stride_align - 1);