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>

33 files changed, 421 insertions, 314 deletions

diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp
index 6e1ff0d..95914a5 100644
--- a/camera/ANativeWindowDisplayAdapter.cpp
+++ b/camera/ANativeWindowDisplayAdapter.cpp
@@ -578,7 +578,7 @@ CameraBuffer* ANativeWindowDisplayAdapter::allocateBufferList(int width, int hei
             /*toOMXPixFormat(format)*/HAL_PIXEL_FORMAT_TI_NV12);  // Gralloc only supports NV12 alloc!
 
     if ( NO_ERROR != err ) {
-        LOGE("native_window_set_buffers_geometry failed: %s (%d)", strerror(-err), -err);
+        CAMHAL_LOGE("native_window_set_buffers_geometry failed: %s (%d)", strerror(-err), -err);
 
         if ( NO_INIT == err ) {
             CAMHAL_LOGEA("Preview surface abandoned!");
@@ -869,7 +869,7 @@ status_t ANativeWindowDisplayAdapter::returnBuffersToWindow()
              }
          }
      else
-         LOGE("mANativeWindow is NULL");
+         CAMHAL_LOGE("mANativeWindow is NULL");
 
      ///Clear the frames with camera adapter map
      mFramesWithCameraAdapterMap.clear();
diff --git a/camera/Android.mk b/camera/Android.mk
index b60cd9d..3f18f17 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -39,7 +39,19 @@ endif
 
 CAMERAHAL_CFLAGS += -DLOG_TAG=\"CameraHal\"
 
-OMAP4_CAMERA_HAL_SRC := \
+TI_CAMERAHAL_COMMON_INCLUDES := \
+    hardware/ti/omap4xxx/tiler \
+    hardware/ti/omap4xxx/hwc \
+    external/jpeg \
+    external/jhead \
+    $(LOCAL_PATH)/../libtiutils \
+    $(LOCAL_PATH)/inc
+
+TI_CAMERAHAL_COMMON_INCLUDES += \
+    frameworks/base/include/media/stagefright \
+    hardware/ti/omap4xxx/include
+
+TI_CAMERAHAL_COMMON_SRC := \
     CameraHal_Module.cpp \
     CameraHal.cpp \
     CameraHalUtilClasses.cpp \
@@ -51,14 +63,12 @@ OMAP4_CAMERA_HAL_SRC := \
     MemoryManager.cpp \
     Encoder_libjpeg.cpp \
     SensorListener.cpp  \
-    NV12_resize.c
-
-OMAP4_CAMERA_COMMON_SRC:= \
+    NV12_resize.cpp \
     CameraParameters.cpp \
     TICameraParameters.cpp \
     CameraHalCommon.cpp
 
-OMAP4_CAMERA_OMX_SRC:= \
+TI_CAMERAHAL_OMX_SRC := \
     OMXCameraAdapter/OMX3A.cpp \
     OMXCameraAdapter/OMXAlgo.cpp \
     OMXCameraAdapter/OMXCameraAdapter.cpp \
@@ -73,55 +83,49 @@ OMAP4_CAMERA_OMX_SRC:= \
     OMXCameraAdapter/OMXZoom.cpp \
     OMXCameraAdapter/OMXDccDataSave.cpp
 
-OMAP4_CAMERA_USB_SRC:= \
+TI_CAMERAHAL_USB_SRC := \
     V4LCameraAdapter/V4LCameraAdapter.cpp \
-    V4LCameraAdapter/V4LCapabilities.cpp \
+    V4LCameraAdapter/V4LCapabilities.cpp
+
+TI_CAMERAHAL_COMMON_SHARED_LIBRARIES := \
+    libui \
+    libbinder \
+    libutils \
+    libcutils \
+    libtiutils \
+    libcamera_client \
+    libgui \
+    libion \
+    libjpeg \
+    libexif
+
 
-#
-# OMX Camera HAL
-#
+# ====================
+#  OMX Camera Adapter
+# --------------------
 
 ifeq ($(OMAP4_CAMERA_HAL_USES),OMX)
 
 include $(CLEAR_VARS)
 
+CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER
+
 LOCAL_SRC_FILES:= \
-    $(OMAP4_CAMERA_HAL_SRC) \
-    $(OMAP4_CAMERA_OMX_SRC) \
-    $(OMAP4_CAMERA_COMMON_SRC)
+    $(TI_CAMERAHAL_COMMON_SRC) \
+    $(TI_CAMERAHAL_OMX_SRC)
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/inc/ \
-    $(LOCAL_PATH)/../hwc \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/inc/OMXCameraAdapter \
-    $(LOCAL_PATH)/../libtiutils \
-    hardware/ti/omap4xxx/tiler \
-    frameworks/base/include/ui \
-    frameworks/base/include/utils \
+    $(TI_CAMERAHAL_COMMON_INCLUDES) \
     $(DOMX_PATH)/omx_core/inc \
     $(DOMX_PATH)/mm_osal/inc \
-    frameworks/base/include/media/stagefright \
-    frameworks/base/include/media/stagefright/openmax \
-    external/jpeg \
-    external/jhead
+    $(LOCAL_PATH)/inc/OMXCameraAdapter
 
 LOCAL_SHARED_LIBRARIES:= \
-    libui \
-    libbinder \
-    libutils \
-    libcutils \
-    libtiutils \
+    $(TI_CAMERAHAL_COMMON_SHARED_LIBRARIES) \
     libmm_osal \
     libOMX_Core \
-    libcamera_client \
-    libgui \
-    libdomx \
-    libion \
-    libjpeg \
-    libexif
+    libdomx
 
-CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER
 LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
@@ -133,44 +137,25 @@ include $(BUILD_HEAPTRACKED_SHARED_LIBRARY)
 else
 ifeq ($(OMAP4_CAMERA_HAL_USES),USB)
 
-#
-# USB Camera Adapter
-#
+
+# ====================
+#  USB Camera Adapter
+# --------------------
 
 include $(CLEAR_VARS)
 
 CAMERAHAL_CFLAGS += -DV4L_CAMERA_ADAPTER
 
 LOCAL_SRC_FILES:= \
-    $(OMAP4_CAMERA_HAL_SRC) \
-    $(OMAP4_CAMERA_USB_SRC) \
-    $(OMAP4_CAMERA_COMMON_SRC)
+    $(TI_CAMERAHAL_COMMON_SRC) \
+    $(TI_CAMERAHAL_USB_SRC)
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/inc/ \
-    $(LOCAL_PATH)/../hwc \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/inc/V4LCameraAdapter \
-    $(LOCAL_PATH)/../libtiutils \
-    hardware/ti/omap4xxx/tiler \
-    frameworks/base/include/ui \
-    frameworks/base/include/utils \
-    frameworks/base/include/media/stagefright \
-    frameworks/base/include/media/stagefright/openmax \
-    external/jpeg \
-    external/jhead
+    $(TI_CAMERAHAL_COMMON_INCLUDES) \
+    $(LOCAL_PATH)/inc/V4LCameraAdapter
 
 LOCAL_SHARED_LIBRARIES:= \
-    libui \
-    libbinder \
-    libutils \
-    libcutils \
-    libtiutils \
-    libcamera_client \
-    libgui \
-    libion \
-    libjpeg \
-    libexif
+    $(TI_CAMERAHAL_COMMON_SHARED_LIBRARIES)
 
 LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS)
 
@@ -183,47 +168,33 @@ include $(BUILD_HEAPTRACKED_SHARED_LIBRARY)
 else
 ifeq ($(OMAP4_CAMERA_HAL_USES),ALL)
 
+
+# =====================
+#  ALL Camera Adapters
+# ---------------------
+
 include $(CLEAR_VARS)
 
+CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER -DV4L_CAMERA_ADAPTER
+
 LOCAL_SRC_FILES:= \
-    $(OMAP4_CAMERA_HAL_SRC) \
-    $(OMAP4_CAMERA_OMX_SRC) \
-    $(OMAP4_CAMERA_USB_SRC) \
-    $(OMAP4_CAMERA_COMMON_SRC)
+    $(TI_CAMERAHAL_COMMON_SRC) \
+    $(TI_CAMERAHAL_OMX_SRC) \
+    $(TI_CAMERAHAL_USB_SRC)
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/inc/ \
-    $(LOCAL_PATH)/../hwc \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/inc/OMXCameraAdapter \
-    $(LOCAL_PATH)/inc/V4LCameraAdapter \
-    $(LOCAL_PATH)/../libtiutils \
-    hardware/ti/omap4xxx/tiler \
-    frameworks/base/include/ui \
-    frameworks/base/include/utils \
+    $(TI_CAMERAHAL_COMMON_INCLUDES) \
     $(DOMX_PATH)/omx_core/inc \
     $(DOMX_PATH)/mm_osal/inc \
-    frameworks/base/include/media/stagefright \
-    frameworks/base/include/media/stagefright/openmax \
-    external/jpeg \
-    external/jhead
+    $(LOCAL_PATH)/inc/OMXCameraAdapter \
+    $(LOCAL_PATH)/inc/V4LCameraAdapter
 
 LOCAL_SHARED_LIBRARIES:= \
-    libui \
-    libbinder \
-    libutils \
-    libcutils \
-    libtiutils \
+    $(TI_CAMERAHAL_COMMON_SHARED_LIBRARIES) \
     libmm_osal \
     libOMX_Core \
-    libcamera_client \
-    libgui \
-    libdomx \
-    libion \
-    libjpeg \
-    libexif
+    libdomx
 
-CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER -DV4L_CAMERA_ADAPTER
 LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
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
diff --git a/camera/CameraHalCommon.cpp b/camera/CameraHalCommon.cpp
index 6d4ea2c..ea97e84 100644
--- a/camera/CameraHalCommon.cpp
+++ b/camera/CameraHalCommon.cpp
@@ -76,7 +76,7 @@ void CameraHal::PPM(const char* str){
     absolute *= 1000;
     absolute += ppm.tv_usec /1000;
 
-    LOGD("PPM: %s :%llu.%llu ms : %llu ms", str, ( elapsed /1000 ), ( elapsed % 1000 ), absolute);
+    CAMHAL_LOGD("PPM: %s :%llu.%llu ms : %llu ms", str, ( elapsed /1000 ), ( elapsed % 1000 ), absolute);
 }
 
 #endif
@@ -109,7 +109,7 @@ void CameraHal::PPM(const char* str, struct timeval* ppm_first, ...){
     ppm.tv_sec = ppm.tv_sec * 1000000;
     ppm.tv_sec = ppm.tv_sec + ppm.tv_usec - ppm_first->tv_usec;
 
-    LOGD("PPM: %s :%ld.%ld ms :  %llu ms", temp_str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ), absolute);
+    CAMHAL_LOGD("PPM: %s :%ld.%ld ms :  %llu ms", temp_str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ), absolute);
 
     va_end(args);
 }
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index ba45a06..eb4a475 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -28,6 +28,13 @@
 #include "TICameraParameters.h"
 
 
+#ifdef CAMERAHAL_DEBUG_VERBOSE
+#   define CAMHAL_LOG_MODULE_FUNCTION_NAME LOG_FUNCTION_NAME
+#else
+#   define CAMHAL_LOG_MODULE_FUNCTION_NAME
+#endif
+
+
 static android::CameraProperties gCameraProperties;
 static android::CameraHal* gCameraHals[MAX_CAMERAS_SUPPORTED];
 static unsigned int gCamerasOpen = 0;
@@ -73,11 +80,11 @@ typedef struct ti_camera_device {
 int camera_set_preview_window(struct camera_device * device,
         struct preview_stream_ops *window)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -93,11 +100,11 @@ int camera_set_buffer_source(struct camera_device * device,
         struct preview_stream_ops *tapin,
         struct preview_stream_ops *tapout)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -116,9 +123,9 @@ void camera_set_callbacks(struct camera_device * device,
         camera_request_memory get_memory,
         void *user)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -130,9 +137,9 @@ void camera_set_callbacks(struct camera_device * device,
 
 void camera_enable_msg_type(struct camera_device * device, int32_t msg_type)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -144,9 +151,9 @@ void camera_enable_msg_type(struct camera_device * device, int32_t msg_type)
 
 void camera_disable_msg_type(struct camera_device * device, int32_t msg_type)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -158,9 +165,9 @@ void camera_disable_msg_type(struct camera_device * device, int32_t msg_type)
 
 int camera_msg_type_enabled(struct camera_device * device, int32_t msg_type)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return 0;
@@ -172,11 +179,11 @@ int camera_msg_type_enabled(struct camera_device * device, int32_t msg_type)
 
 int camera_start_preview(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -189,9 +196,9 @@ int camera_start_preview(struct camera_device * device)
 
 void camera_stop_preview(struct camera_device * device)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -203,11 +210,11 @@ void camera_stop_preview(struct camera_device * device)
 
 int camera_preview_enabled(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -219,11 +226,11 @@ int camera_preview_enabled(struct camera_device * device)
 
 int camera_store_meta_data_in_buffers(struct camera_device * device, int enable)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -237,11 +244,11 @@ int camera_store_meta_data_in_buffers(struct camera_device * device, int enable)
 
 int camera_start_recording(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -253,9 +260,9 @@ int camera_start_recording(struct camera_device * device)
 
 void camera_stop_recording(struct camera_device * device)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -267,11 +274,11 @@ void camera_stop_recording(struct camera_device * device)
 
 int camera_recording_enabled(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -284,9 +291,9 @@ int camera_recording_enabled(struct camera_device * device)
 void camera_release_recording_frame(struct camera_device * device,
                 const void *opaque)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -298,11 +305,11 @@ void camera_release_recording_frame(struct camera_device * device,
 
 int camera_auto_focus(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -314,11 +321,11 @@ int camera_auto_focus(struct camera_device * device)
 
 int camera_cancel_auto_focus(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -334,14 +341,14 @@ int camera_take_picture(struct camera_device * device, const char *params)
 int camera_take_picture(struct camera_device * device)
 #endif
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 #ifndef OMAP_ENHANCEMENT_CPCAM
     const char* params = NULL;
 #endif
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -353,11 +360,11 @@ int camera_take_picture(struct camera_device * device)
 
 int camera_cancel_picture(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -370,11 +377,11 @@ int camera_cancel_picture(struct camera_device * device)
 #ifdef OMAP_ENHANCEMENT_CPCAM
 int camera_reprocess(struct camera_device * device, const char *params)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -386,11 +393,11 @@ int camera_reprocess(struct camera_device * device, const char *params)
 
 int camera_cancel_reprocess(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -403,11 +410,11 @@ int camera_cancel_reprocess(struct camera_device * device)
 
 int camera_set_parameters(struct camera_device * device, const char *params)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -419,11 +426,11 @@ int camera_set_parameters(struct camera_device * device, const char *params)
 
 char* camera_get_parameters(struct camera_device * device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     char* param = NULL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return NULL;
 
@@ -436,9 +443,9 @@ char* camera_get_parameters(struct camera_device * device)
 
 static void camera_put_parameters(struct camera_device *device, char *parms)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -451,11 +458,11 @@ static void camera_put_parameters(struct camera_device *device, char *parms)
 int camera_send_command(struct camera_device * device,
             int32_t cmd, int32_t arg1, int32_t arg2)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     if(!device)
         return rv;
 
@@ -467,9 +474,9 @@ int camera_send_command(struct camera_device * device,
 
 void camera_release(struct camera_device * device)
 {
-    ti_camera_device_t* ti_dev = NULL;
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
 
-    LOGV("%s", __FUNCTION__);
+    ti_camera_device_t* ti_dev = NULL;
 
     if(!device)
         return;
@@ -481,6 +488,8 @@ void camera_release(struct camera_device * device)
 
 int camera_dump(struct camera_device * device, int fd)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int rv = -EINVAL;
     ti_camera_device_t* ti_dev = NULL;
 
@@ -497,11 +506,11 @@ extern "C" void heaptracker_free_leaked_memory(void);
 
 int camera_device_close(hw_device_t* device)
 {
+    CAMHAL_LOG_MODULE_FUNCTION_NAME;
+
     int ret = 0;
     ti_camera_device_t* ti_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
-
     android::Mutex::Autolock lock(gCameraHalDeviceLock);
 
     if (!device) {
@@ -561,7 +570,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
         if(cameraid > num_cameras)
         {
-            LOGE("camera service provided cameraid out of bounds, "
+            CAMHAL_LOGE("camera service provided cameraid out of bounds, "
                     "cameraid = %d, num supported = %d",
                     cameraid, num_cameras);
             rv = -EINVAL;
@@ -570,7 +579,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
         if(gCamerasOpen >= MAX_SIMUL_CAMERAS_SUPPORTED)
         {
-            LOGE("maximum number of cameras already open");
+            CAMHAL_LOGE("maximum number of cameras already open");
             rv = -ENOMEM;
             goto fail;
         }
@@ -578,7 +587,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
         camera_device = (ti_camera_device_t*)malloc(sizeof(*camera_device));
         if(!camera_device)
         {
-            LOGE("camera_device allocation fail");
+            CAMHAL_LOGE("camera_device allocation fail");
             rv = -ENOMEM;
             goto fail;
         }
@@ -586,7 +595,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
         camera_ops = (camera_device_ops_t*)malloc(sizeof(*camera_ops));
         if(!camera_ops)
         {
-            LOGE("camera_ops allocation fail");
+            CAMHAL_LOGE("camera_ops allocation fail");
             rv = -ENOMEM;
             goto fail;
         }
@@ -639,7 +648,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
         if(gCameraProperties.getProperties(cameraid, &properties) < 0)
         {
-            LOGE("Couldn't get camera properties");
+            CAMHAL_LOGE("Couldn't get camera properties");
             rv = -ENOMEM;
             goto fail;
         }
@@ -648,14 +657,14 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
         if(!camera)
         {
-            LOGE("Couldn't create instance of CameraHal class");
+            CAMHAL_LOGE("Couldn't create instance of CameraHal class");
             rv = -ENOMEM;
             goto fail;
         }
 
         if(properties && (camera->initialize(properties) != android::NO_ERROR))
         {
-            LOGE("Couldn't initialize camera instance");
+            CAMHAL_LOGE("Couldn't initialize camera instance");
             rv = -ENODEV;
             goto fail;
         }
@@ -720,7 +729,7 @@ int camera_get_camera_info(int camera_id, struct camera_info *info)
     //Get camera properties for camera index
     if(gCameraProperties.getProperties(camera_id, &properties) < 0)
     {
-        LOGE("Couldn't get camera properties");
+        CAMHAL_LOGE("Couldn't get camera properties");
         rv = -EINVAL;
         goto end;
     }
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index f9a444b..a809115 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -21,7 +21,6 @@
 *
 */
 
-#include "CameraHal.h"
 #include "CameraProperties.h"
 
 namespace android {
diff --git a/camera/CameraProperties.cpp b/camera/CameraProperties.cpp
index a533d5a..c0a1934 100644
--- a/camera/CameraProperties.cpp
+++ b/camera/CameraProperties.cpp
@@ -21,10 +21,6 @@
 *
 */
 
-//#include "CameraHal.h"
-#include <utils/threads.h>
-
-#include "DebugUtils.h"
 #include "CameraProperties.h"
 
 #define CAMERA_ROOT         "CameraRoot"
@@ -105,16 +101,16 @@ status_t CameraProperties::loadProperties()
             MAX_CAMERAS_SUPPORTED, mCamerasSupported);
 
     if(err != NO_ERROR) {
-        LOGE("error while getting capabilities");
+        CAMHAL_LOGE("error while getting capabilities");
         ret = UNKNOWN_ERROR;
     } else if (mCamerasSupported == 0) {
-        LOGE("camera busy. properties not loaded. num_cameras = %d", mCamerasSupported);
+        CAMHAL_LOGE("camera busy. properties not loaded. num_cameras = %d", mCamerasSupported);
         ret = UNKNOWN_ERROR;
     } else if (mCamerasSupported > MAX_CAMERAS_SUPPORTED) {
-        LOGE("returned too many adapaters");
+        CAMHAL_LOGE("returned too many adapaters");
         ret = UNKNOWN_ERROR;
     } else {
-        LOGI("num_cameras = %d", mCamerasSupported);
+        CAMHAL_LOGI("num_cameras = %d", mCamerasSupported);
 
         for (int i = 0; i < mCamerasSupported; i++) {
             mCameraProps[i].setSensorIndex(i);
@@ -122,7 +118,7 @@ status_t CameraProperties::loadProperties()
         }
     }
 
-    LOGV("mCamerasSupported = %d", mCamerasSupported);
+    CAMHAL_LOGV("mCamerasSupported = %d", mCamerasSupported);
     LOG_FUNCTION_NAME_EXIT;
     return ret;
 }
diff --git a/camera/Encoder_libjpeg.cpp b/camera/Encoder_libjpeg.cpp
index e64af8e..6db9e7e 100644
--- a/camera/Encoder_libjpeg.cpp
+++ b/camera/Encoder_libjpeg.cpp
@@ -23,7 +23,6 @@
 *
 */
 
-#include "CameraHal.h"
 #include "Encoder_libjpeg.h"
 #include "NV12_resize.h"
 #include "TICameraParameters.h"
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp
index f42ede3..f9c12c1 100644
--- a/camera/MemoryManager.cpp
+++ b/camera/MemoryManager.cpp
@@ -127,7 +127,7 @@ CameraBuffer* MemoryManager::allocateBufferList(int width, int height, const cha
 
 error:
 
-    LOGE("Freeing buffers already allocated after error occurred");
+    CAMHAL_LOGE("Freeing buffers already allocated after error occurred");
     if(buffers)
         freeBufferList(buffers);
 
diff --git a/camera/NV12_resize.c b/camera/NV12_resize.cpp
index 132becb..2ce6c0c 100644
--- a/camera/NV12_resize.c
+++ b/camera/NV12_resize.cpp
@@ -10,7 +10,6 @@
 #define LOG_TAG "NV12_resize"
 
 #define STRIDE 4096
-#include <utils/Log.h>
 
 /*----------------------------------------------------------------------------
     Define : TRUE/FALSE for boolean operations
@@ -51,7 +50,7 @@ VT_resizeFrame_Video_opt2_lp
  mmUint16 dummy                         /* Transparent pixel value              */
  )
 {
-  LOGV("VT_resizeFrame_Video_opt2_lp+");
+  CAMHAL_LOGV("VT_resizeFrame_Video_opt2_lp+");
 
   mmUint16 row,col;
   mmUint32 resizeFactorX;
@@ -75,19 +74,19 @@ VT_resizeFrame_Video_opt2_lp
 	{
 		if(i_img_ptr->uHeight == o_img_ptr->uHeight)
 			{
-				LOGV("************************f(i_img_ptr->uHeight == o_img_ptr->uHeight) are same *********************\n");
-				LOGV("************************(i_img_ptr->width == %d" , i_img_ptr->uWidth );
-				LOGV("************************(i_img_ptr->uHeight == %d" , i_img_ptr->uHeight );
-				LOGV("************************(o_img_ptr->width == %d" ,o_img_ptr->uWidth );
-				LOGV("************************(o_img_ptr->uHeight == %d" , o_img_ptr->uHeight );
+				CAMHAL_LOGV("************************f(i_img_ptr->uHeight == o_img_ptr->uHeight) are same *********************\n");
+				CAMHAL_LOGV("************************(i_img_ptr->width == %d" , i_img_ptr->uWidth );
+				CAMHAL_LOGV("************************(i_img_ptr->uHeight == %d" , i_img_ptr->uHeight );
+				CAMHAL_LOGV("************************(o_img_ptr->width == %d" ,o_img_ptr->uWidth );
+				CAMHAL_LOGV("************************(o_img_ptr->uHeight == %d" , o_img_ptr->uHeight );
 			}
 	}
 
   if (!i_img_ptr || !i_img_ptr->imgPtr ||
     !o_img_ptr || !o_img_ptr->imgPtr)
   {
-	LOGE("Image Point NULL");
-	LOGV("VT_resizeFrame_Video_opt2_lp-");
+	CAMHAL_LOGE("Image Point NULL");
+	CAMHAL_LOGV("VT_resizeFrame_Video_opt2_lp-");
 	return FALSE;
   }
 
@@ -115,8 +114,8 @@ VT_resizeFrame_Video_opt2_lp
   /* make sure valid input size */
   if (idx < 1 || idy < 1 || i_img_ptr->uStride < 1)
 	{
-	LOGE("idx or idy less then 1 idx = %d idy = %d stride = %d", idx, idy, i_img_ptr->uStride);
-	LOGV("VT_resizeFrame_Video_opt2_lp-");
+	CAMHAL_LOGE("idx or idy less then 1 idx = %d idy = %d stride = %d", idx, idy, i_img_ptr->uStride);
+	CAMHAL_LOGV("VT_resizeFrame_Video_opt2_lp-");
 	return FALSE;
 	}
 
@@ -317,11 +316,11 @@ VT_resizeFrame_Video_opt2_lp
   }
   else
   {
-	LOGE("eFormat not supported");
-	LOGV("VT_resizeFrame_Video_opt2_lp-");
+	CAMHAL_LOGE("eFormat not supported");
+	CAMHAL_LOGV("VT_resizeFrame_Video_opt2_lp-");
 	return FALSE;
   }
-  LOGV("success");
-  LOGV("VT_resizeFrame_Video_opt2_lp-");
+  CAMHAL_LOGV("success");
+  CAMHAL_LOGV("VT_resizeFrame_Video_opt2_lp-");
   return TRUE;
 }
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp
index 34247ca..79e6aac 100644
--- a/camera/OMXCameraAdapter/OMX3A.cpp
+++ b/camera/OMXCameraAdapter/OMX3A.cpp
@@ -514,7 +514,7 @@ static bool isFlashDisabled() {
     char value[PROPERTY_VALUE_MAX];
     if (property_get("camera.flash_off", value, NULL) &&
         (!strcasecmp(value, CameraParameters::TRUE) || !strcasecmp(value, "1"))) {
-        LOGW("flash is disabled for testing purpose");
+        CAMHAL_LOGW("flash is disabled for testing purpose");
         return true;
     }
 
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index af700e3..575b33b 100644
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -703,7 +703,7 @@ void saveFile(unsigned char   *buff, int width, int height, int format) {
     sprintf(fn, "/preview%03d.yuv", counter);
     fd = open(fn, O_CREAT | O_WRONLY | O_SYNC | O_TRUNC, 0777);
     if(fd < 0) {
-        LOGE("Unable to open file %s: %s", fn, strerror(fd));
+        CAMHAL_LOGE("Unable to open file %s: %s", fn, strerror(fd));
         return;
     }
 
@@ -3294,7 +3294,7 @@ static void debugShowFPS()
         mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
         mLastFpsTime = now;
         mLastFrameCount = mFrameCount;
-        LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
+        CAMHAL_LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
     }
     // XXX: mFPS has the value we want
 }
@@ -3473,7 +3473,7 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE
             mFramesWithEncoder++;
             }
 
-        //LOGV("FBD pBuffer = 0x%x", pBuffHeader->pBuffer);
+        //CAMHAL_LOGV("FBD pBuffer = 0x%x", pBuffHeader->pBuffer);
 
         if( mWaitingForSnapshot )
           {
@@ -3494,8 +3494,8 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE
 #ifdef CAMERAHAL_DEBUG
         if(mBuffersWithDucati.indexOfKey((uint32_t)pBuffHeader->pBuffer)<0)
             {
-            LOGE("Buffer was never with Ducati!! %p", pBuffHeader->pBuffer);
-            for(unsigned int i=0;i<mBuffersWithDucati.size();i++) LOGE("0x%x", mBuffersWithDucati.keyAt(i));
+            CAMHAL_LOGE("Buffer was never with Ducati!! %p", pBuffHeader->pBuffer);
+            for(unsigned int i=0;i<mBuffersWithDucati.size();i++) CAMHAL_LOGE("0x%x", mBuffersWithDucati.keyAt(i));
             }
         mBuffersWithDucati.removeItem((int)pBuffHeader->pBuffer);
 #endif
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index 5e2ea13..a87c8b5 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -406,17 +406,6 @@ status_t OMXCameraAdapter::encodePixelformatCap(OMX_COLOR_FORMATTYPE format,
     return ret;
 }
 
-// TODO: Move the min() and max() functions globally.
-template <typename T>
-inline const T & min(const T & a, const T & b) {
-    return a < b ? a : b;
-}
-
-template <typename T>
-inline const T & max(const T & a, const T & b) {
-    return a < b ? b : a;
-}
-
 void OMXCameraAdapter::encodeFrameRates(const int minFrameRate, const int maxFrameRate,
         const OMX_TI_CAPTYPE & caps, const CapFramerate * const fixedFrameRates,
         const int frameRateCount, Vector<FpsRange> & fpsRanges) {
diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp
index efb627e..8cd86ea 100644
--- a/camera/OMXCameraAdapter/OMXExif.cpp
+++ b/camera/OMXCameraAdapter/OMXExif.cpp
@@ -813,7 +813,7 @@ status_t OMXCameraAdapter::convertGPSCoord(double coord,
 
     if ( coord == 0 ) {
 
-        LOGE("Invalid GPS coordinate");
+        CAMHAL_LOGE("Invalid GPS coordinate");
 
         return -EINVAL;
     }
diff --git a/camera/SensorListener.cpp b/camera/SensorListener.cpp
index 00835b3..a5ddbd5 100644
--- a/camera/SensorListener.cpp
+++ b/camera/SensorListener.cpp
@@ -22,7 +22,6 @@
 */
 
 #include "SensorListener.h"
-#include "CameraHal.h"
 
 #include <stdint.h>
 #include <math.h>
diff --git a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
index 1cbc40d..503d3dd 100644
--- a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -836,7 +836,7 @@ static void debugShowFPS()
             mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
             mLastFpsTime = now;
             mLastFrameCount = mFrameCount;
-            LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
+            CAMHAL_LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
         }
     }
 }
@@ -1091,7 +1091,7 @@ void saveFile(unsigned char* buff, int buff_size) {
 
     fd = open(fn, O_CREAT | O_WRONLY | O_SYNC | O_TRUNC, 0777);
     if(fd < 0) {
-        LOGE("Unable to open file %s: %s", fn, strerror(fd));
+        CAMHAL_LOGE("Unable to open file %s: %s", fn, strerror(fd));
         return;
     }
 
diff --git a/camera/inc/ANativeWindowDisplayAdapter.h b/camera/inc/ANativeWindowDisplayAdapter.h
index a97bee6..29379c7 100644
--- a/camera/inc/ANativeWindowDisplayAdapter.h
+++ b/camera/inc/ANativeWindowDisplayAdapter.h
@@ -17,7 +17,6 @@
 
 
 #include "CameraHal.h"
-#include <ui/egl/android_natives.h>
 #include <ui/GraphicBufferMapper.h>
 #include <hal_public.h>
 
diff --git a/camera/inc/BufferSourceAdapter.h b/camera/inc/BufferSourceAdapter.h
index c852288..2973d7e 100644
--- a/camera/inc/BufferSourceAdapter.h
+++ b/camera/inc/BufferSourceAdapter.h
@@ -20,7 +20,6 @@
 #ifdef OMAP_ENHANCEMENT_CPCAM
 
 #include "CameraHal.h"
-#include <ui/egl/android_natives.h>
 #include <ui/GraphicBufferMapper.h>
 #include <hal_public.h>
 
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index 7c95ed0..44b2fbb 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -45,16 +45,15 @@
 #include <ui/GraphicBuffer.h>
 
 /* For IMG_native_handle_t */
-#include <ui/egl/android_natives.h>
 #include <ui/GraphicBufferMapper.h>
 #include <hal_public.h>
 
 #include <ion/ion.h>
 
+#include "Common.h"
 #include "MessageQueue.h"
 #include "Semaphore.h"
 #include "CameraProperties.h"
-#include "DebugUtils.h"
 #include "SensorListener.h"
 
 //temporarily define format here
@@ -95,41 +94,6 @@
 #define LOCK_BUFFER_TRIES 5
 #define HAL_PIXEL_FORMAT_NV12 0x100
 
-#define CAMHAL_LOGI LOGI
-
-// logging functions
-#ifdef CAMERAHAL_DEBUG
-#   define CAMHAL_LOGD  DBGUTILS_LOGD
-#   define CAMHAL_LOGDA DBGUTILS_LOGDA
-#   define CAMHAL_LOGDB DBGUTILS_LOGDB
-#   ifdef CAMERAHAL_DEBUG_VERBOSE
-#       define CAMHAL_LOGV  DBGUTILS_LOGV
-#       define CAMHAL_LOGVA DBGUTILS_LOGVA
-#       define CAMHAL_LOGVB DBGUTILS_LOGVB
-#   else
-#       define CAMHAL_LOGV(...)
-#       define CAMHAL_LOGVA(str)
-#       define CAMHAL_LOGVB(str, ...)
-#   endif
-#else
-#   define CAMHAL_LOGD(...)
-#   define CAMHAL_LOGDA(str)
-#   define CAMHAL_LOGDB(str, ...)
-#   define CAMHAL_LOGV(...)
-#   define CAMHAL_LOGVA(str)
-#   define CAMHAL_LOGVB(str, ...)
-#endif
-
-#define CAMHAL_LOGE  DBGUTILS_LOGE
-#define CAMHAL_LOGEA DBGUTILS_LOGEA
-#define CAMHAL_LOGEB DBGUTILS_LOGEB
-#define CAMHAL_LOGF  DBGUTILS_LOGF
-
-#define CAMHAL_ASSERT DBGUTILS_ASSERT
-#define CAMHAL_ASSERT_X DBGUTILS_ASSERT_X
-
-#define CAMHAL_UNUSED(x) (void)x
-
 #define NONNEG_ASSIGN(x,y) \
     if(x > -1) \
         y = x
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index dcfc2c7..4763b10 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -30,6 +30,8 @@
 #include <ctype.h>
 #include "cutils/properties.h"
 
+#include "Common.h"
+
 namespace android {
 
 #define MAX_CAMERAS_SUPPORTED 3
diff --git a/camera/inc/Common.h b/camera/inc/Common.h
new file mode 100644
index 0000000..232dbbf
--- /dev/null
+++ b/camera/inc/Common.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef CAMERAHAL_COMMON_H
+#define CAMERAHAL_COMMON_H
+
+#include "UtilsCommon.h"
+#include "DebugUtils.h"
+
+
+
+
+// logging functions
+#ifdef CAMERAHAL_DEBUG
+#   define CAMHAL_LOGD  DBGUTILS_LOGD
+#   define CAMHAL_LOGDA DBGUTILS_LOGDA
+#   define CAMHAL_LOGDB DBGUTILS_LOGDB
+#   ifdef CAMERAHAL_DEBUG_VERBOSE
+#       define CAMHAL_LOGV  DBGUTILS_LOGV
+#       define CAMHAL_LOGVA DBGUTILS_LOGVA
+#       define CAMHAL_LOGVB DBGUTILS_LOGVB
+#   else
+#       define CAMHAL_LOGV(...)
+#       define CAMHAL_LOGVA(str)
+#       define CAMHAL_LOGVB(str, ...)
+#   endif
+#else
+#   define CAMHAL_LOGD(...)
+#   define CAMHAL_LOGDA(str)
+#   define CAMHAL_LOGDB(str, ...)
+#   define CAMHAL_LOGV(...)
+#   define CAMHAL_LOGVA(str)
+#   define CAMHAL_LOGVB(str, ...)
+#endif
+
+#define CAMHAL_LOGI  DBGUTILS_LOGI
+#define CAMHAL_LOGW  DBGUTILS_LOGW
+#define CAMHAL_LOGE  DBGUTILS_LOGE
+#define CAMHAL_LOGEA DBGUTILS_LOGEA
+#define CAMHAL_LOGEB DBGUTILS_LOGEB
+#define CAMHAL_LOGF  DBGUTILS_LOGF
+
+#define CAMHAL_ASSERT DBGUTILS_ASSERT
+#define CAMHAL_ASSERT_X DBGUTILS_ASSERT_X
+
+#define CAMHAL_UNUSED(x) (void)x
+
+
+
+
+#endif // CAMERAHAL_COMMON_H
diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h
index abd8b7d..7a8e06a 100644
--- a/camera/inc/Encoder_libjpeg.h
+++ b/camera/inc/Encoder_libjpeg.h
@@ -35,6 +35,8 @@ extern "C" {
 
 }
 
+#include "CameraHal.h"
+
 #define CANCEL_TIMEOUT 5000000 // 5 seconds
 
 namespace android {
diff --git a/camera/inc/NV12_resize.h b/camera/inc/NV12_resize.h
index ba18614..019b9eb 100644
--- a/camera/inc/NV12_resize.h
+++ b/camera/inc/NV12_resize.h
@@ -1,6 +1,8 @@
 #ifndef NV12_RESIZE_H_
 #define NV12_RESIZE_H_
 
+#include "Common.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/camera/inc/SensorListener.h b/camera/inc/SensorListener.h
index 913eb95..f36ea0d 100644
--- a/camera/inc/SensorListener.h
+++ b/camera/inc/SensorListener.h
@@ -30,6 +30,8 @@
 #include <gui/SensorEventQueue.h>
 #include <utils/Looper.h>
 
+#include "Common.h"
+
 namespace android {
 
 /**
diff --git a/cpcam/jni/com_ti_omap_android_cpcam_CPCam.cpp b/cpcam/jni/com_ti_omap_android_cpcam_CPCam.cpp
index 76c7292..dc63789 100644
--- a/cpcam/jni/com_ti_omap_android_cpcam_CPCam.cpp
+++ b/cpcam/jni/com_ti_omap_android_cpcam_CPCam.cpp
@@ -45,6 +45,9 @@
 #include <camera/Camera.h>
 #include <binder/IMemory.h>
 
+#define CAMHAL_LOGV LOGV
+#define CAMHAL_LOGE LOGE
+
 using namespace android;
 
 struct fields_t {
@@ -135,7 +138,7 @@ sp<Camera> get_native_camera(JNIEnv *env, jobject thiz, JNICPCamContext** pConte
     if (context != NULL) {
         camera = context->getCamera();
     }
-    LOGV("get_native_camera: context=%p, camera=%p", context, camera.get());
+    CAMHAL_LOGV("get_native_camera: context=%p, camera=%p", context, camera.get());
     if (camera == 0) {
         jniThrowRuntimeException(env, "Method called after release()");
     }
@@ -165,7 +168,7 @@ JNICPCamContext::JNICPCamContext(JNIEnv* env, jobject weak_this, jclass clazz, c
 
 void JNICPCamContext::release()
 {
-    LOGV("release");
+    CAMHAL_LOGV("release");
     Mutex::Autolock _l(mLock);
     JNIEnv *env = AndroidRuntime::getJNIEnv();
 
@@ -195,7 +198,7 @@ void JNICPCamContext::release()
 
 void JNICPCamContext::notify(int32_t msgType, int32_t ext1, int32_t ext2)
 {
-    LOGV("notify");
+    CAMHAL_LOGV("notify");
 
     // VM pointer will be NULL if object is released
     Mutex::Autolock _l(mLock);
@@ -225,7 +228,7 @@ jbyteArray JNICPCamContext::getCallbackBuffer(
 
     // Vector access should be protected by lock in postData()
     if (!buffers->isEmpty()) {
-        LOGV("Using callback buffer from queue of length %d", buffers->size());
+        CAMHAL_LOGV("Using callback buffer from queue of length %d", buffers->size());
         jbyteArray globalBuffer = buffers->itemAt(0);
         buffers->removeAt(0);
 
@@ -235,7 +238,7 @@ jbyteArray JNICPCamContext::getCallbackBuffer(
         if (obj != NULL) {
             jsize bufferLength = env->GetArrayLength(obj);
             if ((int)bufferLength < (int)bufferSize) {
-                LOGE("Callback buffer was too small! Expected %d bytes, but got %d bytes!",
+                CAMHAL_LOGE("Callback buffer was too small! Expected %d bytes, but got %d bytes!",
                     bufferSize, bufferLength);
                 env->DeleteLocalRef(obj);
                 return NULL;
@@ -255,7 +258,7 @@ void JNICPCamContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int m
         ssize_t offset;
         size_t size;
         sp<IMemoryHeap> heap = dataPtr->getMemory(&offset, &size);
-        LOGV("copyAndPost: off=%ld, size=%d", offset, size);
+        CAMHAL_LOGV("copyAndPost: off=%ld, size=%d", offset, size);
         uint8_t *heapBase = (uint8_t*)heap->base();
 
         if (heapBase != NULL) {
@@ -267,7 +270,7 @@ void JNICPCamContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int m
                 obj = getCallbackBuffer(env, &mCallbackBuffers, size);
 
                 if (mCallbackBuffers.isEmpty()) {
-                    LOGV("Out of buffers, clearing callback!");
+                    CAMHAL_LOGV("Out of buffers, clearing callback!");
                     mCamera->setPreviewCallbackFlags(CAMERA_FRAME_CALLBACK_FLAG_NOOP);
                     mManualCameraCallbackSet = false;
 
@@ -276,18 +279,18 @@ void JNICPCamContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int m
                     }
                 }
             } else {
-                LOGV("Allocating callback buffer");
+                CAMHAL_LOGV("Allocating callback buffer");
                 obj = env->NewByteArray(size);
             }
 
             if (obj == NULL) {
-                LOGE("Couldn't allocate byte array for JPEG data");
+                CAMHAL_LOGE("Couldn't allocate byte array for JPEG data");
                 env->ExceptionClear();
             } else {
                 env->SetByteArrayRegion(obj, 0, size, data);
             }
         } else {
-            LOGE("image heap is NULL");
+            CAMHAL_LOGE("image heap is NULL");
         }
     }
 
@@ -321,7 +324,7 @@ void JNICPCamContext::postData(int32_t msgType, const sp<IMemory>& dataPtr,
         // For backward-compatibility purpose, if there is no callback
         // buffer for raw image, the callback returns null.
         case CAMERA_MSG_RAW_IMAGE:
-            LOGV("rawCallback");
+            CAMHAL_LOGV("rawCallback");
             if (mRawImageCallbackBuffers.isEmpty()) {
                 env->CallStaticVoidMethod(mCameraJClass, fields.post_event,
                         mCameraJObjectWeak, dataMsgType, 0, 0, NULL);
@@ -335,7 +338,7 @@ void JNICPCamContext::postData(int32_t msgType, const sp<IMemory>& dataPtr,
             break;
 
         default:
-            LOGV("dataCallback(%d, %p)", dataMsgType, dataPtr.get());
+            CAMHAL_LOGV("dataCallback(%d, %p)", dataMsgType, dataPtr.get());
             copyAndPost(env, dataPtr, dataMsgType);
             break;
     }
@@ -357,7 +360,7 @@ void JNICPCamContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_me
     jobject meta_obj = NULL;
     meta_obj = (jobject) env->NewObject(mMetadataClass, fields.metadata_constructor);
     if (meta_obj == NULL) {
-        LOGE("Couldn't allocate metadata class");
+        CAMHAL_LOGE("Couldn't allocate metadata class");
         return;
     }
 
@@ -368,7 +371,7 @@ void JNICPCamContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_me
     faces_obj = (jobjectArray) env->NewObjectArray(metadata->number_of_faces,
                                              mFaceClass, NULL);
     if (faces_obj == NULL) {
-        LOGE("Couldn't allocate face metadata array");
+        CAMHAL_LOGE("Couldn't allocate face metadata array");
         goto err_alloc_faces;
     }
 
@@ -430,7 +433,7 @@ void JNICPCamContext::setCallbackMode(JNIEnv *env, bool installed, bool manualMo
 void JNICPCamContext::addCallbackBuffer(
         JNIEnv *env, jbyteArray cbb, int msgType)
 {
-    LOGV("addCallbackBuffer: 0x%x", msgType);
+    CAMHAL_LOGV("addCallbackBuffer: 0x%x", msgType);
     if (cbb != NULL) {
         Mutex::Autolock _l(mLock);
         switch (msgType) {
@@ -438,7 +441,7 @@ void JNICPCamContext::addCallbackBuffer(
                 jbyteArray callbackBuffer = (jbyteArray)env->NewGlobalRef(cbb);
                 mCallbackBuffers.push(callbackBuffer);
 
-                LOGV("Adding callback buffer to queue, %d total",
+                CAMHAL_LOGV("Adding callback buffer to queue, %d total",
                         mCallbackBuffers.size());
 
                 // We want to make sure the camera knows we're ready for the
@@ -463,7 +466,7 @@ void JNICPCamContext::addCallbackBuffer(
             }
         }
     } else {
-       LOGE("Null byte array!");
+       CAMHAL_LOGE("Null byte array!");
     }
 }
 
@@ -474,7 +477,7 @@ void JNICPCamContext::clearCallbackBuffers_l(JNIEnv *env)
 }
 
 void JNICPCamContext::clearCallbackBuffers_l(JNIEnv *env, Vector<jbyteArray> *buffers) {
-    LOGV("Clearing callback buffers, %d remained", buffers->size());
+    CAMHAL_LOGV("Clearing callback buffers, %d remained", buffers->size());
     while (!buffers->isEmpty()) {
         env->DeleteGlobalRef(buffers->top());
         buffers->pop();
@@ -538,8 +541,8 @@ static void com_ti_omap_android_cpcam_CPCam_native_setup(JNIEnv *env, jobject th
 // finalizer is invoked later.
 static void com_ti_omap_android_cpcam_CPCam_release(JNIEnv *env, jobject thiz)
 {
-    // TODO: Change to LOGV
-    LOGV("release camera");
+    // TODO: Change to CAMHAL_LOGV
+    CAMHAL_LOGV("release camera");
     JNICPCamContext* context = NULL;
     sp<Camera> camera;
     {
@@ -554,7 +557,7 @@ static void com_ti_omap_android_cpcam_CPCam_release(JNIEnv *env, jobject thiz)
     if (context != NULL) {
         camera = context->getCamera();
         context->release();
-        LOGV("native_release: context=%p camera=%p", context, camera.get());
+        CAMHAL_LOGV("native_release: context=%p camera=%p", context, camera.get());
 
         // clear callbacks
         if (camera != NULL) {
@@ -569,7 +572,7 @@ static void com_ti_omap_android_cpcam_CPCam_release(JNIEnv *env, jobject thiz)
 
 static void com_ti_omap_android_cpcam_CPCam_setPreviewDisplay(JNIEnv *env, jobject thiz, jobject jSurface)
 {
-    LOGV("setPreviewDisplay");
+    CAMHAL_LOGV("setPreviewDisplay");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -585,7 +588,7 @@ static void com_ti_omap_android_cpcam_CPCam_setPreviewDisplay(JNIEnv *env, jobje
 static void com_ti_omap_android_cpcam_CPCam_setPreviewTexture(JNIEnv *env,
         jobject thiz, jobject jSurfaceTexture)
 {
-    LOGV("setPreviewTexture");
+    CAMHAL_LOGV("setPreviewTexture");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -603,7 +606,7 @@ static void com_ti_omap_android_cpcam_CPCam_setPreviewTexture(JNIEnv *env,
 static void com_ti_omap_android_cpcam_CPCam_setBufferSource(JNIEnv *env,
         jobject thiz, jobject jTapIn, jobject jTapOut)
 {
-    LOGV("setBufferSource");
+    CAMHAL_LOGV("setBufferSource");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -631,7 +634,7 @@ static void com_ti_omap_android_cpcam_CPCam_reprocess(JNIEnv *env,
     const char *shotParams = (jShotParams) ? env->GetStringUTFChars(jShotParams, NULL) : NULL;
     String8 params(shotParams ? shotParams: "");
 
-    LOGV("reprocess");
+    CAMHAL_LOGV("reprocess");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -643,7 +646,7 @@ static void com_ti_omap_android_cpcam_CPCam_reprocess(JNIEnv *env,
 
 static void com_ti_omap_android_cpcam_CPCam_startPreview(JNIEnv *env, jobject thiz)
 {
-    LOGV("startPreview");
+    CAMHAL_LOGV("startPreview");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -655,7 +658,7 @@ static void com_ti_omap_android_cpcam_CPCam_startPreview(JNIEnv *env, jobject th
 
 static void com_ti_omap_android_cpcam_CPCam_stopPreview(JNIEnv *env, jobject thiz)
 {
-    LOGV("stopPreview");
+    CAMHAL_LOGV("stopPreview");
     sp<Camera> c = get_native_camera(env, thiz, NULL);
     if (c == 0) return;
 
@@ -664,7 +667,7 @@ static void com_ti_omap_android_cpcam_CPCam_stopPreview(JNIEnv *env, jobject thi
 
 static bool com_ti_omap_android_cpcam_CPCam_previewEnabled(JNIEnv *env, jobject thiz)
 {
-    LOGV("previewEnabled");
+    CAMHAL_LOGV("previewEnabled");
     sp<Camera> c = get_native_camera(env, thiz, NULL);
     if (c == 0) return false;
 
@@ -673,7 +676,7 @@ static bool com_ti_omap_android_cpcam_CPCam_previewEnabled(JNIEnv *env, jobject
 
 static void com_ti_omap_android_cpcam_CPCam_setHasPreviewCallback(JNIEnv *env, jobject thiz, jboolean installed, jboolean manualBuffer)
 {
-    LOGV("setHasPreviewCallback: installed:%d, manualBuffer:%d", (int)installed, (int)manualBuffer);
+    CAMHAL_LOGV("setHasPreviewCallback: installed:%d, manualBuffer:%d", (int)installed, (int)manualBuffer);
     // Important: Only install preview_callback if the Java code has called
     // setPreviewCallback() with a non-null value, otherwise we'd pay to memcpy
     // each preview frame for nothing.
@@ -687,7 +690,7 @@ static void com_ti_omap_android_cpcam_CPCam_setHasPreviewCallback(JNIEnv *env, j
 }
 
 static void com_ti_omap_android_cpcam_CPCam_addCallbackBuffer(JNIEnv *env, jobject thiz, jbyteArray bytes, int msgType) {
-    LOGV("addCallbackBuffer: 0x%x", msgType);
+    CAMHAL_LOGV("addCallbackBuffer: 0x%x", msgType);
 
     JNICPCamContext* context = reinterpret_cast<JNICPCamContext*>(env->GetIntField(thiz, fields.context));
 
@@ -698,7 +701,7 @@ static void com_ti_omap_android_cpcam_CPCam_addCallbackBuffer(JNIEnv *env, jobje
 
 static void com_ti_omap_android_cpcam_CPCam_autoFocus(JNIEnv *env, jobject thiz)
 {
-    LOGV("autoFocus");
+    CAMHAL_LOGV("autoFocus");
     JNICPCamContext* context;
     sp<Camera> c = get_native_camera(env, thiz, &context);
     if (c == 0) return;
@@ -710,7 +713,7 @@ static void com_ti_omap_android_cpcam_CPCam_autoFocus(JNIEnv *env, jobject thiz)
 
 static void com_ti_omap_android_cpcam_CPCam_cancelAutoFocus(JNIEnv *env, jobject thiz)
 {
-    LOGV("cancelAutoFocus");
+    CAMHAL_LOGV("cancelAutoFocus");
     JNICPCamContext* context;
     sp<Camera> c = get_native_camera(env, thiz, &context);
     if (c == 0) return;
@@ -722,7 +725,7 @@ static void com_ti_omap_android_cpcam_CPCam_cancelAutoFocus(JNIEnv *env, jobject
 
 static void com_ti_omap_android_cpcam_CPCam_takePicture(JNIEnv *env, jobject thiz, int msgType, jstring params)
 {
-    LOGV("takePicture");
+    CAMHAL_LOGV("takePicture");
     JNICPCamContext* context;
     sp<Camera> camera = get_native_camera(env, thiz, &context);
     if (camera == 0) return;
@@ -744,9 +747,9 @@ static void com_ti_omap_android_cpcam_CPCam_takePicture(JNIEnv *env, jobject thi
      * Java application.
      */
     if (msgType & CAMERA_MSG_RAW_IMAGE) {
-        LOGV("Enable raw image callback buffer");
+        CAMHAL_LOGV("Enable raw image callback buffer");
         if (!context->isRawImageCallbackBufferAvailable()) {
-            LOGV("Enable raw image notification, since no callback buffer exists");
+            CAMHAL_LOGV("Enable raw image notification, since no callback buffer exists");
             msgType &= ~CAMERA_MSG_RAW_IMAGE;
             msgType |= CAMERA_MSG_RAW_IMAGE_NOTIFY;
         }
@@ -760,7 +763,7 @@ static void com_ti_omap_android_cpcam_CPCam_takePicture(JNIEnv *env, jobject thi
 
 static void com_ti_omap_android_cpcam_CPCam_setParameters(JNIEnv *env, jobject thiz, jstring params)
 {
-    LOGV("setParameters");
+    CAMHAL_LOGV("setParameters");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -778,7 +781,7 @@ static void com_ti_omap_android_cpcam_CPCam_setParameters(JNIEnv *env, jobject t
 
 static jstring com_ti_omap_android_cpcam_CPCam_getParameters(JNIEnv *env, jobject thiz)
 {
-    LOGV("getParameters");
+    CAMHAL_LOGV("getParameters");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return 0;
 
@@ -787,7 +790,7 @@ static jstring com_ti_omap_android_cpcam_CPCam_getParameters(JNIEnv *env, jobjec
 
 static void com_ti_omap_android_cpcam_CPCam_reconnect(JNIEnv *env, jobject thiz)
 {
-    LOGV("reconnect");
+    CAMHAL_LOGV("reconnect");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -799,7 +802,7 @@ static void com_ti_omap_android_cpcam_CPCam_reconnect(JNIEnv *env, jobject thiz)
 
 static void com_ti_omap_android_cpcam_CPCam_lock(JNIEnv *env, jobject thiz)
 {
-    LOGV("lock");
+    CAMHAL_LOGV("lock");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -810,7 +813,7 @@ static void com_ti_omap_android_cpcam_CPCam_lock(JNIEnv *env, jobject thiz)
 
 static void com_ti_omap_android_cpcam_CPCam_unlock(JNIEnv *env, jobject thiz)
 {
-    LOGV("unlock");
+    CAMHAL_LOGV("unlock");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -821,7 +824,7 @@ static void com_ti_omap_android_cpcam_CPCam_unlock(JNIEnv *env, jobject thiz)
 
 static void com_ti_omap_android_cpcam_CPCam_startSmoothZoom(JNIEnv *env, jobject thiz, jint value)
 {
-    LOGV("startSmoothZoom");
+    CAMHAL_LOGV("startSmoothZoom");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -837,7 +840,7 @@ static void com_ti_omap_android_cpcam_CPCam_startSmoothZoom(JNIEnv *env, jobject
 
 static void com_ti_omap_android_cpcam_CPCam_stopSmoothZoom(JNIEnv *env, jobject thiz)
 {
-    LOGV("stopSmoothZoom");
+    CAMHAL_LOGV("stopSmoothZoom");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -849,7 +852,7 @@ static void com_ti_omap_android_cpcam_CPCam_stopSmoothZoom(JNIEnv *env, jobject
 static void com_ti_omap_android_cpcam_CPCam_setDisplayOrientation(JNIEnv *env, jobject thiz,
         jint value)
 {
-    LOGV("setDisplayOrientation");
+    CAMHAL_LOGV("setDisplayOrientation");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -861,7 +864,7 @@ static void com_ti_omap_android_cpcam_CPCam_setDisplayOrientation(JNIEnv *env, j
 static void com_ti_omap_android_cpcam_CPCam_startFaceDetection(JNIEnv *env, jobject thiz,
         jint type)
 {
-    LOGV("startFaceDetection");
+    CAMHAL_LOGV("startFaceDetection");
     JNICPCamContext* context;
     sp<Camera> camera = get_native_camera(env, thiz, &context);
     if (camera == 0) return;
@@ -878,7 +881,7 @@ static void com_ti_omap_android_cpcam_CPCam_startFaceDetection(JNIEnv *env, jobj
 
 static void com_ti_omap_android_cpcam_CPCam_stopFaceDetection(JNIEnv *env, jobject thiz)
 {
-    LOGV("stopFaceDetection");
+    CAMHAL_LOGV("stopFaceDetection");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -983,13 +986,13 @@ static int find_fields(JNIEnv *env, field *fields, int count)
         field *f = &fields[i];
         jclass clazz = env->FindClass(f->class_name);
         if (clazz == NULL) {
-            LOGE("Can't find %s", f->class_name);
+            CAMHAL_LOGE("Can't find %s", f->class_name);
             return -1;
         }
 
         jfieldID field = env->GetFieldID(clazz, f->field_name, f->field_type);
         if (field == NULL) {
-            LOGE("Can't find %s.%s", f->class_name, f->field_name);
+            CAMHAL_LOGE("Can't find %s.%s", f->class_name, f->field_name);
             return -1;
         }
 
@@ -1027,28 +1030,28 @@ int registerCPCamMethods(JNIEnv *env)
     fields.post_event = env->GetStaticMethodID(clazz, "postEventFromNative",
                                                "(Ljava/lang/Object;IIILjava/lang/Object;)V");
     if (fields.post_event == NULL) {
-        LOGE("Can't find com/ti/omap/android/cpcam/CPCam.postEventFromNative");
+        CAMHAL_LOGE("Can't find com/ti/omap/android/cpcam/CPCam.postEventFromNative");
         return -1;
     }
 
     clazz = env->FindClass("android/graphics/Rect");
     fields.rect_constructor = env->GetMethodID(clazz, "<init>", "()V");
     if (fields.rect_constructor == NULL) {
-        LOGE("Can't find android/graphics/Rect.Rect()");
+        CAMHAL_LOGE("Can't find android/graphics/Rect.Rect()");
         return -1;
     }
 
     clazz = env->FindClass("com/ti/omap/android/cpcam/CPCam$Face");
     fields.face_constructor = env->GetMethodID(clazz, "<init>", "()V");
     if (fields.face_constructor == NULL) {
-        LOGE("Can't find com/ti/omap/android/cpcam/CPCam$Face.Face()");
+        CAMHAL_LOGE("Can't find com/ti/omap/android/cpcam/CPCam$Face.Face()");
         return -1;
     }
 
     clazz = env->FindClass("com/ti/omap/android/cpcam/CPCam$Metadata");
     fields.metadata_constructor = env->GetMethodID(clazz, "<init>", "()V");
     if (fields.metadata_constructor == NULL) {
-        LOGE("Can't find com/ti/omap/android/cpcam/CPCam$Metadata.Metadata()");
+        CAMHAL_LOGE("Can't find com/ti/omap/android/cpcam/CPCam$Metadata.Metadata()");
         return -1;
     }
 
@@ -1062,7 +1065,7 @@ int registerCPCamMethods(JNIEnv *env)
     if (env->RegisterNatives(clazz, cpcamMethods,
             sizeof(cpcamMethods) / sizeof(cpcamMethods[0])) != JNI_OK)
     {
-        LOGE("Failed registering methods for %s\n", "com/ti/omap/android/cpcam/CPCam");
+        CAMHAL_LOGE("Failed registering methods for %s\n", "com/ti/omap/android/cpcam/CPCam");
         return -1;
     }
 
@@ -1079,13 +1082,13 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     jint result = -1;
 
     if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
-        LOGE("ERROR: GetEnv failed\n");
+        CAMHAL_LOGE("ERROR: GetEnv failed\n");
         goto bail;
     }
     assert(env != NULL);
 
     if (registerCPCamMethods(env) != 0) {
-        LOGE("ERROR: PlatformLibrary native registration failed\n");
+        CAMHAL_LOGE("ERROR: PlatformLibrary native registration failed\n");
         goto bail;
     }
 
diff --git a/libtiutils/Android.mk b/libtiutils/Android.mk
index 8e45913..362cf12 100644
--- a/libtiutils/Android.mk
+++ b/libtiutils/Android.mk
@@ -20,7 +20,9 @@ LOCAL_SHARED_LIBRARIES:= \
     libcutils
 
 LOCAL_C_INCLUDES += \
-    frameworks/base/include/utils \
+    frameworks/base/include
+
+LOCAL_C_INCLUDES += \
     bionic/libc/include \
     $(DOMX_PATH)/omx_core/inc \
     $(DOMX_PATH)/mm_osal/inc
diff --git a/libtiutils/DebugUtils.h b/libtiutils/DebugUtils.h
index aa7f92d..a05ba8d 100644
--- a/libtiutils/DebugUtils.h
+++ b/libtiutils/DebugUtils.h
@@ -156,6 +156,8 @@ private:
 
 #define DBGUTILS_LOGV(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_VERBOSE, __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
 #define DBGUTILS_LOGD(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_DEBUG,   __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
+#define DBGUTILS_LOGI(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_INFO,    __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
+#define DBGUTILS_LOGW(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_WARN,    __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
 #define DBGUTILS_LOGE(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_ERROR,   __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
 #define DBGUTILS_LOGF(...) DBGUTILS_LOGV_FULL(ANDROID_LOG_FATAL,   __FILE__, __LINE__, __FUNCTION__, TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - " __VA_ARGS__, "")
 
@@ -349,7 +351,8 @@ inline FunctionLogger::FunctionLogger(const char * const file, const int line, c
 {
     Debug * const debug = Debug::instance();
     debug->increaseOffsetForCurrentThread();
-    LOGD(TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s+ %s:%d %s - ENTER",
+    android_printLog(ANDROID_LOG_DEBUG, LOG_TAG,
+            TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s+ %s:%d %s - ENTER",
             TI_UTILS_DEBUG_TIMESTAMP_VARIABLE
             (int)mThreadId, IndentString<>(debug->offsetForCurrentThread()).string(),
             mFile, mLine, mFunction);
@@ -359,7 +362,8 @@ inline FunctionLogger::FunctionLogger(const char * const file, const int line, c
 inline FunctionLogger::~FunctionLogger()
 {
     Debug * const debug = Debug::instance();
-    LOGD(TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s- %s:%d %s - EXIT",
+    android_printLog(ANDROID_LOG_DEBUG, LOG_TAG,
+            TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s- %s:%d %s - EXIT",
             TI_UTILS_DEBUG_TIMESTAMP_VARIABLE
             (int)mThreadId, IndentString<>(debug->offsetForCurrentThread()).string(),
             mFile, mExitLine == -1 ? mLine : mExitLine, mFunction);
@@ -372,7 +376,8 @@ inline void FunctionLogger::setExitLine(const int line)
     if ( mExitLine != -1 )
     {
         Debug * const debug = Debug::instance();
-        LOGD(TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - Double function exit trace detected. Previous: %d",
+        android_printLog(ANDROID_LOG_DEBUG, LOG_TAG,
+                TI_UTILS_DEBUG_TIMESTAMP_TOKEN "(%x) %s  %s:%d %s - Double function exit trace detected. Previous: %d",
                 TI_UTILS_DEBUG_TIMESTAMP_VARIABLE
                 (int)mThreadId, IndentString<>(debug->offsetForCurrentThread()).string(),
                 mFile, line, mFunction, mExitLine);
diff --git a/libtiutils/ErrorUtils.h b/libtiutils/ErrorUtils.h
index 24dd806..204ec97 100644
--- a/libtiutils/ErrorUtils.h
+++ b/libtiutils/ErrorUtils.h
@@ -18,7 +18,7 @@
 #define ERROR_UTILS_H
 
 ///Header file where all the android error codes are defined
-#include <Errors.h>
+#include <utils/Errors.h>
 
 ///Header file where all the OMX error codes are defined
 #include "OMX_Core.h"
diff --git a/libtiutils/MessageQueue.cpp b/libtiutils/MessageQueue.cpp
index c04fd46..997add2 100644
--- a/libtiutils/MessageQueue.cpp
+++ b/libtiutils/MessageQueue.cpp
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <unistd.h>
-#include <Errors.h>
+#include <utils/Errors.h>
 
 
 
diff --git a/libtiutils/Semaphore.h b/libtiutils/Semaphore.h
index 466e709..6990848 100644
--- a/libtiutils/Semaphore.h
+++ b/libtiutils/Semaphore.h
@@ -16,7 +16,7 @@
 
 
 
-#include <Errors.h>
+#include <utils/Errors.h>
 #include <semaphore.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/libtiutils/UtilsCommon.h b/libtiutils/UtilsCommon.h
new file mode 100644
index 0000000..571bc81
--- /dev/null
+++ b/libtiutils/UtilsCommon.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TI_UTILS_COMMON_H
+#define TI_UTILS_COMMON_H
+
+#include <android/api-level.h>
+#include <android/log.h>
+
+
+
+namespace android {
+
+
+
+
+// default float point type
+typedef float real;
+
+
+
+
+template <typename T>
+int floor(T x);
+
+template <typename T>
+int round(T x);
+
+template <typename T>
+const T & min(const T & a, const T & b);
+
+template <typename T>
+const T & max(const T & a, const T & b);
+
+template <typename T>
+const T & bound(const T & min, const T & x, const T & max);
+
+template <typename T>
+T abs(const T & x);
+
+
+
+
+template <typename T>
+inline int floor(const T x) {
+    return static_cast<int>(x);
+}
+
+template <typename T>
+inline int round(const T x) {
+    if ( x >= 0 ) {
+        return floor(x + T(0.5));
+    } else {
+        return floor(x - floor(x - T(1)) + T(0.5)) + floor(x - T(1));
+    }
+}
+
+template <typename T>
+inline const T & min(const T & a, const T & b) {
+    return a < b ? a : b;
+}
+
+template <typename T>
+inline const T & max(const T & a, const T & b) {
+    return a < b ? b : a;
+}
+
+template <typename T>
+inline const T & bound(const T & min, const T & x, const T & max) {
+    return x < min ? min : x > max ? max : x;
+}
+
+template <typename T>
+inline T abs(const T & x) {
+    return x >= 0 ? x : -x;
+}
+
+
+
+
+} // namespace android
+
+
+
+
+#endif // TI_UTILS_COMMON_H
diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h
index 21a0d87..7edb2a1 100644
--- a/test/CameraHal/camera_test.h
+++ b/test/CameraHal/camera_test.h
@@ -1,6 +1,9 @@
 #ifndef CAMERA_TEST_H
 #define CAMERA_TEST_H
 
+#define CAMHAL_LOGV LOGV
+#define CAMHAL_LOGE LOGE
+
 #define PRINTOVER(arg...)     LOGD(#arg)
 #define LOG_FUNCTION_NAME         LOGD("%d: %s() ENTER", __LINE__, __FUNCTION__);
 #define LOG_FUNCTION_NAME_EXIT    LOGD("%d: %s() EXIT", __LINE__, __FUNCTION__);
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index bd7b19f..5fa734b 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -610,19 +610,19 @@ void saveFile(const sp<IMemory>& mem) {
     sprintf(fn, "%s/preview%03d.yuv", images_dir_path, counter);
     fd = open(fn, O_CREAT | O_WRONLY | O_TRUNC, 0777);
     if(fd < 0) {
-        LOGE("Unable to open file %s: %s", fn, strerror(fd));
+        CAMHAL_LOGE("Unable to open file %s: %s", fn, strerror(fd));
         goto out;
     }
 
     size = mem->size();
     if (size <= 0) {
-        LOGE("IMemory object is of zero size");
+        CAMHAL_LOGE("IMemory object is of zero size");
         goto out;
     }
 
     buff = (unsigned char *)mem->pointer();
     if (!buff) {
-        LOGE("Buffer pointer is invalid");
+        CAMHAL_LOGE("Buffer pointer is invalid");
         goto out;
     }
 
@@ -700,19 +700,19 @@ void my_jpeg_callback(const sp<IMemory>& mem) {
     fd = open(fn, O_CREAT | O_WRONLY | O_TRUNC, 0777);
 
     if(fd < 0) {
-        LOGE("Unable to open file %s: %s", fn, strerror(fd));
+        CAMHAL_LOGE("Unable to open file %s: %s", fn, strerror(fd));
         goto out;
     }
 
     size = mem->size();
     if (size <= 0) {
-        LOGE("IMemory object is of zero size");
+        CAMHAL_LOGE("IMemory object is of zero size");
         goto out;
     }
 
     buff = (unsigned char *)mem->pointer();
     if (!buff) {
-        LOGE("Buffer pointer is invalid");
+        CAMHAL_LOGE("Buffer pointer is invalid");
         goto out;
     }