samsung: update gralloc_ump to the r2p3 release
Bring the gralloc_ump library directories up to version r2p3-01rel0
Change-Id: I8e9dd3ddabfa064644d2ba398bcad69d426561b8
Signed-off-by: Angus Ainslie <angus.ainslie@linaro.org>
diff --git a/alloc_device.cpp b/alloc_device.cpp
index d46704b..30320a1 100644
--- a/alloc_device.cpp
+++ b/alloc_device.cpp
@@ -168,22 +168,11 @@
size_t size;
size_t stride;
- if (format == HAL_PIXEL_FORMAT_YCbCr_420_SP ||
- format == HAL_PIXEL_FORMAT_YCbCr_422_SP ||
- format == HAL_PIXEL_FORMAT_YV12 )
+ if (format == HAL_PIXEL_FORMAT_YCrCb_420_SP || format == HAL_PIXEL_FORMAT_YV12 )
{
- int vstride;
switch (format)
{
- case HAL_PIXEL_FORMAT_YCbCr_420_SP:
- stride = (w + 1) & ~1;
- size = stride * h * 2;
- break;
- case HAL_PIXEL_FORMAT_YCbCr_422_SP:
- stride = (w + 1) & ~1;
- vstride = (h+1) & ~1;
- size = (stride * vstride) + (w/2 * h/2) * 2;
- break;
+ case HAL_PIXEL_FORMAT_YCrCb_420_SP:
case HAL_PIXEL_FORMAT_YV12:
stride = (w + 15) & ~15;
size = h * (stride + stride/2);
diff --git a/gralloc_module.cpp b/gralloc_module.cpp
index 2f4bda2..1d65a2e 100644
--- a/gralloc_module.cpp
+++ b/gralloc_module.cpp
@@ -69,7 +69,7 @@
if (!s_ump_is_open)
{
- ump_result res = ump_open();
+ ump_result res = ump_open(); // TODO: Fix a ump_close() somewhere???
if (res != UMP_OK)
{
pthread_mutex_unlock(&s_map_lock);
diff --git a/gralloc_priv.h b/gralloc_priv.h
index 2c4e492..bf3e05e 100644
--- a/gralloc_priv.h
+++ b/gralloc_priv.h
@@ -32,7 +32,7 @@
#define GRALLOC_ARM_UMP_MODULE 1
enum {
- /* OEM specific HAL formats */
+ /* OEM specific HAL formats - this number should be greater than 0x100 */
HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x100,
};
