summaryrefslogtreecommitdiffstats
path: root/camera/CameraHal.cpp
diff options
context:
space:
mode:
authorSundar Raman <sunds@ti.com>2011-08-28 19:25:55 -0700
committerIliyan Malchev <malchev@google.com>2011-08-30 09:36:21 -0700
commitc7a945e0434f1b99021d46fddf88bf776da6ad37 (patch)
treebbe7ce6dc33b95fa4111088379c72ed388ce9ceb /camera/CameraHal.cpp
parent6c73fda9fdca5431e4e7911bb3171e36088a861e (diff)
downloadhardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.zip
hardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.tar.gz
hardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.tar.bz2
CameraHAL: Adds ION support to MemoryManager
MemoryManager has been updated to allocate from ION carveout instead of 1D TILER via MemMgr. Note: 2D TILER allocation is not supported as it is not needed currently. We may have to add support for it in the future. Change-Id: I3507da9a26ef4cadfda26ee21c8e12bbce515656 Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera/CameraHal.cpp')
-rw-r--r--camera/CameraHal.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 8f67058..5af0825 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -1019,6 +1019,7 @@ status_t CameraHal::allocPreviewDataBufs(size_t size, size_t bufferCount)
if ( NO_ERROR == ret )
{
+ bytes = ((bytes+4095)/4096)*4096;
mPreviewDataBufs = (int32_t *)mMemoryManager->allocateBuffer(0, 0, NULL, bytes, bufferCount);
CAMHAL_LOGDB("Size of Preview data buffer = %d", bytes);
@@ -1101,6 +1102,7 @@ status_t CameraHal::allocImageBufs(unsigned int width, unsigned int height, size
if ( NO_ERROR == ret )
{
+ bytes = ((bytes+4095)/4096)*4096;
mImageBufs = (int32_t *)mMemoryManager->allocateBuffer(0, 0, previewFormat, bytes, bufferCount);
CAMHAL_LOGDB("Size of Image cap buffer = %d", bytes);