LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gralloc: Fix NV12_ENCODEABLE allocation

Browse Source 
Targets having the venus core have the same allocation and stride
requirements for HAL_PIXEL_FORMAT_NV12_ENCODEABLE as the
HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS format.

Change-Id: Ie5ab8db6639dfa791c5be0161cde6140c3dae779
This commit is contained in:
Naseer Ahmed
2013-08-15 13:07:24 -04:00
parent 692fd5bbaa
commit ce0c9500a4
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgralloc/alloc_controller.cpp
View File

@@ -146,7 +146,6 @@ int AdrenoMemInfo::getStride(int width, int format)
case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED: case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
stride = ALIGN(width, 128); stride = ALIGN(width, 128);
break; break;
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
case HAL_PIXEL_FORMAT_YCbCr_420_SP: case HAL_PIXEL_FORMAT_YCbCr_420_SP:
case HAL_PIXEL_FORMAT_YCrCb_420_SP: case HAL_PIXEL_FORMAT_YCrCb_420_SP:
case HAL_PIXEL_FORMAT_YV12: case HAL_PIXEL_FORMAT_YV12:
@@ -155,6 +154,7 @@ int AdrenoMemInfo::getStride(int width, int format)
stride = ALIGN(width, 16); stride = ALIGN(width, 16);
break; break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS: case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
stride = VENUS_Y_STRIDE(COLOR_FMT_NV12, width); stride = VENUS_Y_STRIDE(COLOR_FMT_NV12, width);
break; break;
case HAL_PIXEL_FORMAT_BLOB: case HAL_PIXEL_FORMAT_BLOB:
@@ -306,21 +306,14 @@ size_t getBufferSizeAndDimensions(int width, int height, int format,
size = ALIGN( alignedw * alignedh, 8192); size = ALIGN( alignedw * alignedh, 8192);
size += ALIGN( alignedw * ALIGN(height/2, 32), 8192); size += ALIGN( alignedw * ALIGN(height/2, 32), 8192);
break; break;
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
case HAL_PIXEL_FORMAT_YV12: case HAL_PIXEL_FORMAT_YV12:
if ((format == HAL_PIXEL_FORMAT_YV12) && ((width&1) || (height&1))) { if ((format == HAL_PIXEL_FORMAT_YV12) && ((width&1) || (height&1))) {
ALOGE("w or h is odd for the YV12 format"); ALOGE("w or h is odd for the YV12 format");
return -EINVAL; return -EINVAL;
} }
alignedh = height; alignedh = height;
if (HAL_PIXEL_FORMAT_NV12_ENCODEABLE == format) { size = alignedw*alignedh +
// The encoder requires a 2K aligned chroma offset.
size = ALIGN(alignedw*alignedh, 2048) +
(ALIGN(alignedw/2, 16) * (alignedh/2))*2; (ALIGN(alignedw/2, 16) * (alignedh/2))*2;
} else {
size = alignedw*alignedh +
(ALIGN(alignedw/2, 16) * (alignedh/2))*2;
}
size = ALIGN(size, 4096); size = ALIGN(size, 4096);
break; break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP: case HAL_PIXEL_FORMAT_YCbCr_420_SP:
@@ -338,6 +331,7 @@ size_t getBufferSizeAndDimensions(int width, int height, int format,
size = ALIGN(alignedw * alignedh * 2, 4096); size = ALIGN(alignedw * alignedh * 2, 4096);
break; break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS: case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
alignedh = VENUS_Y_SCANLINES(COLOR_FMT_NV12, height); alignedh = VENUS_Y_SCANLINES(COLOR_FMT_NV12, height);
size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height); size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height);
break; break;