diff options
author | Daniel Levin <dendy@ti.com> | 2012-05-31 11:22:16 +0300 |
---|---|---|
committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:56:45 -0500 |
commit | f998f57b85b1a6eda8ea1c4b511199eb2d122a9f (patch) | |
tree | 9079a0baa12bb29b2b3d260ad00ac3810f869dd9 /camera/BaseCameraAdapter.cpp | |
parent | bf05c17fc0d1daf5129781373e34e9d67bf02f2e (diff) | |
download | hardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.zip hardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.tar.gz hardware_ti_omap4-f998f57b85b1a6eda8ea1c4b511199eb2d122a9f.tar.bz2 |
CameraHAL: Portability changes
1. Moved common definitions to Global.h header:
- CAMHAL_LOG* macros (also added CAMHAL_LOGI and CAMHAL_LOGW)
- CAMHAL_ASSERT* macros
- CAMHAL_UNUSED macro
2. Renamed NV12_resize.c to NV12_resize.cpp
3. Added common math functions into UtilsGlobal.h header:
- min(a, b) - returns min of a and b
- max(a, b) - returns max of a and b
- bound(min, a, max) - return nearest value to a in scope [min..max]
- floor(a) - round a to lower integer
- round(a) - round a to nearest integer
4. Portability:
- Fixed LOG* macros to use appropriate CAMHAL_LOG* wrappers.
- Reworked the Android.mk to include proper directories depending
on current pastry.
Change-Id: I6fbd1ee02d8af2195b91cc357ddcf554fe77f495
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera/BaseCameraAdapter.cpp')
-rw-r--r-- | camera/BaseCameraAdapter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp index ad3ea38..a05cac5 100644 --- a/camera/BaseCameraAdapter.cpp +++ b/camera/BaseCameraAdapter.cpp @@ -391,8 +391,8 @@ void BaseCameraAdapter::returnFrame(CameraBuffer * frameBuf, CameraFrame::FrameT ((CameraFrame::PREVIEW_FRAME_SYNC == frameType) || (CameraFrame::SNAPSHOT_FRAME == frameType))) { - LOGE("Buffer already with Ducati!! 0x%x", frameBuf); - for(int i=0;i<mBuffersWithDucati.size();i++) LOGE("0x%x", mBuffersWithDucati.keyAt(i)); + CAMHAL_LOGE("Buffer already with Ducati!! 0x%x", frameBuf); + for(int i=0;i<mBuffersWithDucati.size();i++) CAMHAL_LOGE("0x%x", mBuffersWithDucati.keyAt(i)); } mBuffersWithDucati.add((int)camera_buffer_get_omx_ptr(frameBuf),1); #endif |