diff options
author | Sundar Raman <sunds@ti.com> | 2011-08-28 19:25:55 -0700 |
---|---|---|
committer | Iliyan Malchev <malchev@google.com> | 2011-08-30 09:36:21 -0700 |
commit | c7a945e0434f1b99021d46fddf88bf776da6ad37 (patch) | |
tree | bbe7ce6dc33b95fa4111088379c72ed388ce9ceb /camera/OMXCameraAdapter/OMXCapabilities.cpp | |
parent | 6c73fda9fdca5431e4e7911bb3171e36088a861e (diff) | |
download | hardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.tar.gz hardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.tar.bz2 hardware_ti_omap4xxx-c7a945e0434f1b99021d46fddf88bf776da6ad37.zip |
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/OMXCameraAdapter/OMXCapabilities.cpp')
-rw-r--r-- | camera/OMXCameraAdapter/OMXCapabilities.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp index 7c31824..7966e9f 100644 --- a/camera/OMXCameraAdapter/OMXCapabilities.cpp +++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp @@ -1128,8 +1128,8 @@ status_t OMXCameraAdapter::getCaps(CameraProperties::Properties* params, OMX_HAN LOG_FUNCTION_NAME; - // allocate tiler (or ion) buffer for caps - caps_size = sizeof(OMX_TI_CAPTYPE); + // allocate tiler (or ion) buffer for caps (size is always a multiple of 4K) + caps_size = ((sizeof(OMX_TI_CAPTYPE)+4095)/4096)*4096; caps = (OMX_TI_CAPTYPE**) memMgr.allocateBuffer(0, 0, NULL, caps_size, 1); if (!caps) { |