dynamical ctrl for logcat

24 files changed, 416 insertions, 511 deletions

diff --git a/ANativeWindowDisplayAdapter.cpp b/ANativeWindowDisplayAdapter.cpp
index 3227efa..c18b161 100755
--- a/ANativeWindowDisplayAdapter.cpp
+++ b/ANativeWindowDisplayAdapter.cpp
@@ -16,18 +16,12 @@
 
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "ANativeW"
+#define LOG_TAG "CAMHAL_ANativeW        "
 
 #include "ANativeWindowDisplayAdapter.h"
 #include <ui/GraphicBuffer.h>
 #include <ui/GraphicBufferMapper.h>
-
-#if 0
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME           LOGV("%d: %s() ENTER", __LINE__, __FUNCTION__);
-#define LOG_FUNCTION_NAME_EXIT      LOGV("%d: %s() EXIT", __LINE__, __FUNCTION__);
-#endif
+#include "DebugUtils.h"
 
 namespace android {
 
@@ -507,7 +501,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c
     // Set gralloc usage bits for window.
     err = mANativeWindow->set_usage(mANativeWindow, CAMHAL_GRALLOC_USAGE);
     if (err != 0) {
-        LOGE("native_window_set_usage failed: %s (%d)", strerror(-err), -err);
+        CAMHAL_LOGEB("native_window_set_usage failed: %s\n", strerror(-err));
 
         if ( ENODEV == err ) {
             CAMHAL_LOGEA("Preview surface abandoned!");
@@ -521,7 +515,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c
     ///Set the number of buffers needed for camera preview
     err = mANativeWindow->set_buffer_count(mANativeWindow, numBufs);
     if (err != 0) {
-        LOGE("native_window_set_buffer_count failed: %s (%d)", strerror(-err), -err);
+        CAMHAL_LOGEB("native_window_set_buffer_count failed: %s (%d)", strerror(-err), -err);
 
         if ( ENODEV == err ) {
             CAMHAL_LOGEA("Preview surface abandoned!");
@@ -563,7 +557,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c
             mNativeWindowPixelFormat); //NV21
 
     if (err != 0) {
-        LOGE("native_window_set_buffers_geometry failed: %s (%d)", strerror(-err), -err);
+        CAMHAL_LOGEB("native_window_set_buffers_geometry failed: %s", strerror(-err));
 
         if ( ENODEV == err ) {
             CAMHAL_LOGEA("Preview surface abandoned!");
@@ -822,7 +816,7 @@ status_t ANativeWindowDisplayAdapter::returnBuffersToWindow()
         }
     }
     else{
-        LOGE("mANativeWindow is NULL");
+        CAMHAL_LOGEA("mANativeWindow is NULL\n");
     }
     ///Clear the frames with camera adapter map
     mFramesWithCameraAdapterMap.clear();
@@ -1075,7 +1069,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
         mapper.unlock((buffer_handle_t) mGrallocHandleMap[i]);
         ret = mANativeWindow->enqueue_buffer(mANativeWindow, mBufferHandleMap[i]);
         if (ret != 0) {
-            LOGE("Surface::queueBuffer returned error %d", ret);
+            CAMHAL_LOGEB("Surface::queueBuffer returned error %d", ret);
         }
 
         mFramesWithCameraAdapterMap.removeItem((int) dispFrame.mBuffer);
@@ -1117,7 +1111,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
         // cancel buffer and dequeue another one
         ret = mANativeWindow->cancel_buffer(mANativeWindow, mBufferHandleMap[i]);
         if (ret != 0) {
-            LOGE("Surface::queueBuffer returned error %d", ret);
+            CAMHAL_LOGEB("Surface::queueBuffer returned error %d", ret);
         }
 
         mFramesWithCameraAdapterMap.removeItem((int) dispFrame.mBuffer);
diff --git a/Android.mk b/Android.mk
index 308e26e..a5a7937 100755
--- a/Android.mk
+++ b/Android.mk
@@ -74,6 +74,10 @@ CAMHAL_LAST_CHANGED="$(shell cd $(LOCAL_PATH);git log | grep Date -m 1)"
 CAMHAL_BUILD_TIME=" $(shell date)"
 CAMHAL_BUILD_NAME=" $(shell echo ${LOGNAME})"
 CAMHAL_BRANCH_NAME="$(shell cd $(LOCAL_PATH);git branch -a | sed -n '/'*'/p')"
+CAMHAL_BUILD_MODE=$(shell echo ${TARGET_BUILD_VARIANT})
+CAMHAL_HOSTNAME="$(shell hostname)"
+CAMHAL_IP="$(shell ifconfig eth0|grep -oE '([0-9]{1,3}\.?){4}'|head -n 1)"
+CAMHAL_PATH="$(shell echo ${ANDROID_BUILD_TOP})"
 
 LOCAL_CFLAGS+=-DHAVE_VERSION_INFO
 LOCAL_CFLAGS+=-DCAMHAL_GIT_VERSION=\"${CAMHAL_GIT_VERSION}${CAMHAL_GIT_DIRTY}\"
@@ -82,7 +86,13 @@ LOCAL_CFLAGS+=-DCAMHAL_LAST_CHANGED=\"${CAMHAL_LAST_CHANGED}\"
 LOCAL_CFLAGS+=-DCAMHAL_BUILD_TIME=\"${CAMHAL_BUILD_TIME}\"
 LOCAL_CFLAGS+=-DCAMHAL_BUILD_NAME=\"${CAMHAL_BUILD_NAME}\"
 LOCAL_CFLAGS+=-DCAMHAL_GIT_UNCOMMIT_FILE_NUM=${CAMHAL_GIT_UNCOMMIT_FILE_NUM}
+LOCAL_CFLAGS+=-DCAMHAL_HOSTNAME=\"${CAMHAL_HOSTNAME}\"
+LOCAL_CFLAGS+=-DCAMHAL_IP=\"${CAMHAL_IP}\"
+LOCAL_CFLAGS+=-DCAMHAL_PATH=\"${CAMHAL_PATH}\"
 
+ifeq ($(CAMHAL_BUILD_MODE),user)
+    LOCAL_CFLAGS += -DCAMHAL_USER_MODE
+endif
 ifeq ($(BOARD_HAVE_FRONT_CAM),true)
     LOCAL_CFLAGS += -DAMLOGIC_FRONT_CAMERA_SUPPORT
 endif
diff --git a/AppCallbackNotifier.cpp b/AppCallbackNotifier.cpp
index 2b3a7ff..71282a0 100755
--- a/AppCallbackNotifier.cpp
+++ b/AppCallbackNotifier.cpp
@@ -17,8 +17,7 @@
 
 
 
-#define LOG_TAG "AppCallbackNotif"
-
+#define LOG_TAG "CAMHAL_AppCallbackNotif"
 
 #include "CameraHal.h"
 #include "VideoMetadata.h"
@@ -861,7 +860,7 @@ void AppCallbackNotifier::notifyFrame()
                            (CameraFrame::ENCODE_RAW_YUV420SP_TO_JPEG & frame->mQuirks)))
                 {
 
-                    LOGD("IMAGE_FRAME ENCODE_RAW.. %d", __LINE__);
+                    CAMHAL_LOGDA("IMAGE_FRAME ENCODE_RAW.. ");
                     int encode_quality = 100, tn_quality = 100;
                     int tn_width, tn_height;
                     unsigned int current_snapshot = 0;
@@ -989,7 +988,7 @@ void AppCallbackNotifier::notifyFrame()
                     }
 #endif
 
-                    LOGD("IMAGE_FRAME ENCODE_RAW.. %d", __LINE__);
+                    CAMHAL_LOGDA("IMAGE_FRAME ENCODE_RAW..");
                     sp<Encoder_libjpeg> encoder = new Encoder_libjpeg(main_jpeg,
                                                       tn_jpeg,
                                                       AppCallbackNotifierEncoderCallback,
@@ -1171,7 +1170,7 @@ void AppCallbackNotifier::notifyFrame()
                 } else {
                     mFrameProvider->returnFrame(frame->mBuffer,
                                                 ( CameraFrame::FrameType ) frame->mFrameType);
-                    CAMHAL_LOGDB("Frame type 0x%x is still unsupported!", frame->mFrameType);
+                    CAMHAL_LOGVB("Frame type 0x%x is still unsupported!", frame->mFrameType);
                 }
 
                 break;
diff --git a/BaseCameraAdapter.cpp b/BaseCameraAdapter.cpp
index c358599..4301a34 100755
--- a/BaseCameraAdapter.cpp
+++ b/BaseCameraAdapter.cpp
@@ -16,7 +16,7 @@
 
 
 
-#define LOG_TAG "CameraHAL"
+#define LOG_TAG "CAMHALBaseCameraAdapter"
 
 #include "BaseCameraAdapter.h"
 
@@ -1823,7 +1823,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch INTIALIZED_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch INTIALIZED_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -1906,7 +1906,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch PREVIEW_ACTIVE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch PREVIEW_ACTIVE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -1933,7 +1933,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch LOADED_CAPTURE_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch LOADED_CAPTURE_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -1947,7 +1947,6 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
             switch ( operation )
                 {
                 case CAMERA_CANCEL_AUTOFOCUS:
-                     CAMHAL_LOGDA("bad situation!!\n");
                 case CAMERA_STOP_IMAGE_CAPTURE:
                 case CAMERA_STOP_BRACKET_CAPTURE:
                     CAMHAL_LOGDB("Adapter state switch CAPTURE_STATE->PREVIEW_STATE event = 0x%x",
@@ -1956,7 +1955,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch CAPTURE_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch CAPTURE_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -1984,7 +1983,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch BRACKETING_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch BRACKETING_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2013,7 +2012,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch AF_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch AF_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2052,7 +2051,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch ZOOM_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch ZOOM_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2097,7 +2096,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch VIDEO_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch VIDEO_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2118,7 +2117,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch VIDEO_AF_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch VIDEO_AF_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2139,7 +2138,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch LOADED_CAPTURE_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch LOADED_CAPTURE_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2159,7 +2158,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch CAPTURE_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch CAPTURE_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2186,7 +2185,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch AF_ZOOM_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch AF_ZOOM_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2213,7 +2212,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch VIDEO_ZOOM_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch VIDEO_ZOOM_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2234,7 +2233,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
                     break;
 
                 default:
-                    CAMHAL_LOGEB("Adapter state switch BRACKETING_ZOOM_STATE Invalid Op! event = 0x%x",
+                    CAMHAL_LOGDB("Adapter state switch BRACKETING_ZOOM_STATE Invalid Op! event = 0x%x",
                                  operation);
                     ret = INVALID_OPERATION;
                     break;
@@ -2244,7 +2243,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
             break;
 
         default:
-            CAMHAL_LOGEA("Invalid Adapter state!");
+            CAMHAL_LOGDA("Invalid Adapter state!");
             ret = INVALID_OPERATION;
         }
 
@@ -2325,7 +2324,7 @@ status_t BaseCameraAdapter::rollbackToPreviousState()
             break;
 
         default:
-            CAMHAL_LOGEA("Invalid Adapter state!");
+            CAMHAL_LOGDB("currentState:%d Invalid\n",currentState);
             ret = INVALID_OPERATION;
     }
 
diff --git a/CameraHal.cpp b/CameraHal.cpp
index 331a28e..cacafaa 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -21,8 +21,8 @@
 *
 */
 
-#define LOG_NDEBUG 0
-#define LOG_TAG "CameraHAL"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CameraHAL              "
 
 #include "CameraHal.h"
 #include "ANativeWindowDisplayAdapter.h"
@@ -34,10 +34,6 @@
 #include <math.h>
 
 namespace android {
-#define LOGD ALOGD
-#define LOGE ALOGE
-#define LOGV ALOGV
-#define LOGI ALOGI
 
 static void write_sys_int(const char *path, int val)
 {
@@ -1017,19 +1013,19 @@ int CameraHal::setParameters(const CameraParameters& params)
             CAMHAL_LOGEB("Metering areas position set %s", params.get(CameraParameters::KEY_METERING_AREAS));
             mParameters.set(CameraParameters::KEY_METERING_AREAS, valstr);
             }
-
-LOGD("setParameters, 1 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+        CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
         CameraParameters adapterParams = mParameters;
 
         // Only send parameters to adapter if preview is already
         // enabled or doesSetParameterNeedUpdate says so. Initial setParameters to camera adapter,
         // will be called in startPreview()
         // TODO(XXX): Need to identify other parameters that need update from camera adapter
-LOGD("setParameters mCameraAdapter=%#x mPreviewEnabled=%d updateRequired=%d", (uint32_t)mCameraAdapter, (uint32_t)mPreviewEnabled, (uint32_t)updateRequired);
+        CAMHAL_LOGDB("mCameraAdapter=%p,mPreviewEnabled=%d, updateRequired=%d\n",
+                        mCameraAdapter, mPreviewEnabled, updateRequired);
         if ( (NULL != mCameraAdapter) && (mPreviewEnabled || updateRequired) ) {
             ret |= mCameraAdapter->setParameters(adapterParams);
         }
-LOGD("setParameters, 2 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+        CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
 
         if( NULL != params.get(ExCameraParameters::KEY_TEMP_BRACKETING_RANGE_POS) )
             {
@@ -1132,7 +1128,7 @@ LOGD("setParameters, 2 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraP
         return ret;
         }
 
-LOGD("setParameters, 3 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+    CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
     LOG_FUNCTION_NAME_EXIT;
 
     return ret;
@@ -1162,7 +1158,7 @@ status_t CameraHal::allocPreviewBufs(int width, int height, const char* previewF
                                                                     mPreviewLength,
                                                                     buffercount);
         
-        LOGD("allocPreviewBufs buffercount=%d", buffercount);
+        CAMHAL_LOGDB("allocPreviewBufs buffercount=%d", buffercount);
 
         if (NULL == mPreviewBufs ) {
             CAMHAL_LOGEA("Couldn't allocate preview buffers");
@@ -1210,7 +1206,7 @@ status_t CameraHal::allocPreviewBufs(int width, int height, const char* previewF
         //buf_size = ((buf_size+4095)/4096)*4096;
         mPreviewBufs = (int32_t *)mMemoryManager->allocateBuffer(0, 0, NULL, buf_size, buffercount);
 		        
-        LOGD("allocPreviewBufs buffercount=%d", buffercount);
+        CAMHAL_LOGDB("allocPreviewBufs buffercount=%d", buffercount);
 
         if (NULL == mPreviewBufs ) {
             CAMHAL_LOGEA("Couldn't allocate preview buffers");
@@ -2744,12 +2740,12 @@ char* CameraHal::getParameters()
 
     LOG_FUNCTION_NAME;
 
-LOGD("getParameters, 1 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+    CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
     if( NULL != mCameraAdapter )
     {
         mCameraAdapter->getParameters(mParameters);
     }
-LOGD("getParameters, 2 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+    CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
 
     CameraParameters mParams = mParameters;
 
@@ -3661,7 +3657,7 @@ void CameraHal::forceStopPreview()
            mCameraAdapter->sendCommand(CameraAdapter::CAMERA_STOP_FD);
         }
 
-        LOGD("rollback!!!!!!!!");
+        CAMHAL_LOGDA("rollback!!!!!!!!");
         mCameraAdapter->rollbackToInitializedState();
 
     }
diff --git a/CameraHalCommon.cpp b/CameraHalCommon.cpp
index a8eca74..ead73e0 100755
--- a/CameraHalCommon.cpp
+++ b/CameraHalCommon.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "CameraHalCommon        "
 #include "CameraHal.h"
 #ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
 #include "VirtualCamHal.h"
@@ -52,7 +53,7 @@ void CameraHal::PPM(const char* str){
     ppm.tv_sec = ppm.tv_sec * 1000000;
     ppm.tv_sec = ppm.tv_sec + ppm.tv_usec - ppm_start.tv_usec;
 
-    LOGD("PPM: %s :%ld.%ld ms", str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ));
+    CAMHAL_LOGDB("PPM: %s :%ld.%ld ms", str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ));
 }
 
 #elif PPM_INSTRUMENTATION_ABS
@@ -82,7 +83,8 @@ 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_LOGDB("PPM: %s :%llu.%llu ms : %llu ms",
+                    str, (elapsed/1000), (elapsed%1000), absolute);
 }
 
 #endif
@@ -115,7 +117,8 @@ 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_LOGDB("PPM: %s :%ld.%ld ms :  %llu ms",
+                temp_str, (ppm.tv_sec/1000), (ppm.tv_sec%1000), absolute);
 
     va_end(args);
 }
diff --git a/CameraHalUtilClasses.cpp b/CameraHalUtilClasses.cpp
index 52312d1..d4f2dd0 100755
--- a/CameraHalUtilClasses.cpp
+++ b/CameraHalUtilClasses.cpp
@@ -15,8 +15,7 @@
  */

 

 

-#define LOG_TAG "CameraHAL"

-

+#define LOG_TAG "CameraHALUtilClasses   "

 

 #include "CameraHal.h"

 

diff --git a/CameraHal_Module.cpp b/CameraHal_Module.cpp
index fa13460..76df824 100755
--- a/CameraHal_Module.cpp
+++ b/CameraHal_Module.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
-#define LOG_TAG "CameraHAL"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CameraHAL_Module       "
 
 #include <utils/threads.h>
 
+#include "DebugUtils.h"
 #include "CameraHal.h"
 #ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
 #include "VirtualCamHal.h"
@@ -27,7 +28,6 @@
 #include "CameraProperties.h"
 #include "ExCameraParameters.h"
 
-
 static android::CameraProperties gCameraProperties;
 #ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
 static android::CameraHal* gCameraHals[MAX_CAM_NUM_ADD_VCAM-1];
@@ -45,6 +45,18 @@ static int camera_device_close(hw_device_t* device);
 static int camera_get_number_of_cameras(void);
 static int camera_get_camera_info(int camera_id, struct camera_info *info);
 
+#ifdef CAMHAL_USER_MODE
+volatile int32_t gCamHal_LogLevel = 4;
+#else
+volatile int32_t gCamHal_LogLevel = 6;
+#endif
+static void setLogLevel(void *p){ 
+        int level = (int) p;
+        android_atomic_write(level, &gCamHal_LogLevel);
+}
+
+
+
 static struct hw_module_methods_t camera_module_methods = {
         open: camera_device_open
 };
@@ -73,10 +85,6 @@ typedef struct aml_camera_device {
 #endif
 } aml_camera_device_t;
 
-#define LOGV ALOGV
-#define LOGD ALOGD
-#define LOGE ALOGE
-#define LOGI ALOGI
 /*******************************************************************
  * implementation of camera_device_ops functions
  *******************************************************************/
@@ -87,7 +95,7 @@ int camera_set_preview_window(struct camera_device * device,
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -114,7 +122,7 @@ void camera_set_callbacks(struct camera_device * device,
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -134,7 +142,7 @@ void camera_enable_msg_type(struct camera_device * device, int32_t msg_type)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -154,7 +162,7 @@ void camera_disable_msg_type(struct camera_device * device, int32_t msg_type)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -174,7 +182,7 @@ int camera_msg_type_enabled(struct camera_device * device, int32_t msg_type)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return 0;
@@ -189,7 +197,7 @@ int camera_start_preview(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -210,7 +218,7 @@ void camera_stop_preview(struct camera_device * device)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -231,7 +239,7 @@ int camera_preview_enabled(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -252,7 +260,7 @@ int camera_store_meta_data_in_buffers(struct camera_device * device, int enable)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -275,7 +283,7 @@ int camera_start_recording(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -295,7 +303,7 @@ void camera_stop_recording(struct camera_device * device)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -316,7 +324,7 @@ int camera_recording_enabled(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -337,7 +345,7 @@ void camera_release_recording_frame(struct camera_device * device,
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -358,7 +366,7 @@ int camera_auto_focus(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -379,7 +387,7 @@ int camera_cancel_auto_focus(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -400,7 +408,7 @@ int camera_take_picture(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -421,7 +429,7 @@ int camera_cancel_picture(struct camera_device * device)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -442,7 +450,7 @@ int camera_set_parameters(struct camera_device * device, const char *params)
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -463,7 +471,7 @@ char* camera_get_parameters(struct camera_device * device)
     char* param = NULL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return NULL;
@@ -484,7 +492,7 @@ static void camera_put_parameters(struct camera_device *device, char *parms)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -506,7 +514,7 @@ int camera_send_command(struct camera_device * device,
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -526,7 +534,7 @@ void camera_release(struct camera_device * device)
 {
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return;
@@ -546,6 +554,7 @@ int camera_dump(struct camera_device * device, int fd)
 {
     int rv = -EINVAL;
     aml_camera_device_t* aml_dev = NULL;
+    LOG_FUNCTION_NAME;
 
     if(!device)
         return rv;
@@ -557,6 +566,9 @@ int camera_dump(struct camera_device * device, int fd)
         return gVCameraHals->dump(fd);
     }
 #endif
+
+    setLogLevel(aml_dev->base.priv);
+
     rv = gCameraHals[aml_dev->cameraid]->dump(fd);
     return rv;
 }
@@ -568,7 +580,7 @@ int camera_device_close(hw_device_t* device)
     int ret = 0;
     aml_camera_device_t* aml_dev = NULL;
 
-    LOGV("%s", __FUNCTION__);
+    LOG_FUNCTION_NAME;
 
     android::Mutex::Autolock lock(gCameraHalDeviceLock);
 
@@ -637,7 +649,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
     android::Mutex::Autolock lock(gCameraHalDeviceLock);
 
-    LOGI("camera_device open");
+    CAMHAL_LOGIA("camera_device open");
 
     if (name != NULL) {
         cameraid = atoi(name);
@@ -645,7 +657,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_LOGEB("camera service provided cameraid out of bounds,"
                     "cameraid = %d, num supported = %d",
                     cameraid, num_cameras);
             rv = -EINVAL;
@@ -655,7 +667,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 #ifndef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
         if(gCamerasOpen >= MAX_SIMUL_CAMERAS_SUPPORTED)
         {
-            LOGE("maximum number of cameras already open");
+            CAMHAL_LOGEA("maximum number of cameras already open");
             rv = -ENOMEM;
             goto fail;
         }
@@ -663,7 +675,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
         if((gCamerasOpen >= MAX_SIMUL_CAMERAS_SUPPORTED) &&
             (!gVCameraHals) )
         {
-            LOGE("maximum number of cameras already open");
+            CAMHAL_LOGEA("maximum number of cameras already open");
             rv = -ENOMEM;
             goto fail;
         }
@@ -676,7 +688,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 		camera_device = (aml_camera_device_t*)malloc(sizeof(*camera_device));
 		if(!camera_device)
 		{
-		    LOGE("camera_device allocation fail");
+		    CAMHAL_LOGEA("camera_device allocation fail");
 		    rv = -ENOMEM;
 		    goto fail;
 		}
@@ -684,7 +696,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_LOGEA("camera_ops allocation fail");
 		    rv = -ENOMEM;
 		    goto fail;
 		}
@@ -726,13 +738,13 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
 		// -------- vendor specific stuff --------
 
-        LOGD("virtual num_cameras=%d cameraid=%d", num_cameras, cameraid);
+                CAMHAL_LOGDB("virtual num_cameras=%d cameraid=%d", num_cameras, cameraid);
 		camera_device->cameraid = cameraid;
 		camera_device->type = 1;
 
 		if(gCameraProperties.getProperties(cameraid, &properties) < 0)
 		{
-		    LOGE("Couldn't get virtual camera properties");
+		    CAMHAL_LOGEA("Couldn't get virtual camera properties");
 		    rv = -ENOMEM;
 		    goto fail;
 		}
@@ -742,14 +754,14 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
 		if(!gVCameraHals)
 		{
-		    LOGE("Couldn't create instance of VirtualCameraHal class");
+		    CAMHAL_LOGEA("Couldn't create instance of VirtualCameraHal class");
 		    rv = -ENOMEM;
 		    goto fail;
 		}
 
 		if(properties && (gVCameraHals->initialize(properties) != android::NO_ERROR))
 		{
-		    LOGE("Couldn't initialize virtual camera instance");
+		    CAMHAL_LOGEA("Couldn't initialize virtual camera instance");
 		    rv = -ENODEV;
 		    goto fail;
 		}
@@ -763,7 +775,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
         camera_device = (aml_camera_device_t*)malloc(sizeof(*camera_device));
         if(!camera_device)
         {
-            LOGE("camera_device allocation fail");
+            CAMHAL_LOGEA("camera_device allocation fail");
             rv = -ENOMEM;
             goto fail;
         }
@@ -771,7 +783,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_LOGEA("camera_ops allocation fail");
             rv = -ENOMEM;
             goto fail;
         }
@@ -813,7 +825,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
 
         // -------- vendor specific stuff --------
 
-LOGD("num_cameras=%d cameraid=%d", num_cameras, cameraid);
+        CAMHAL_LOGDB("num_cameras=%d cameraid=%d", num_cameras, cameraid);
         camera_device->cameraid = cameraid;
 #ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
 	camera_device->type = 0;
@@ -821,7 +833,7 @@ LOGD("num_cameras=%d cameraid=%d", num_cameras, cameraid);
 
         if(gCameraProperties.getProperties(cameraid, &properties) < 0)
         {
-            LOGE("Couldn't get camera properties");
+            CAMHAL_LOGEA("Couldn't get camera properties");
             rv = -ENOMEM;
             goto fail;
         }
@@ -830,14 +842,14 @@ LOGD("num_cameras=%d cameraid=%d", num_cameras, cameraid);
 
         if(!camera)
         {
-            LOGE("Couldn't create instance of CameraHal class");
+            CAMHAL_LOGEA("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_LOGEA("Couldn't initialize camera instance");
             rv = -ENODEV;
             goto fail;
         }
@@ -874,7 +886,7 @@ int camera_get_number_of_cameras(void)
 					gCamerasSupported, num_cameras);
 
 #ifdef HAVE_VERSION_INFO
-    CAMHAL_LOGDB("\n--------------------------------\n" 
+    CAMHAL_LOGIB("\n--------------------------------\n" 
                   "author:aml.sh multi-media team\n"
                   "branch name:   %s\n"
                   "git version:   %s \n"
@@ -882,13 +894,17 @@ int camera_get_number_of_cameras(void)
                   "build-time:    %s\n"
                   "build-name:    %s\n"
                   "uncommitted-file-num:%d\n"
+                  "ssh user@%s, cd %s\n"
+                  "hostname %s\n"
                   "--------------------------------\n",
                   CAMHAL_BRANCH_NAME,
                   CAMHAL_GIT_VERSION,
                   CAMHAL_LAST_CHANGED,
                   CAMHAL_BUILD_TIME,
                   CAMHAL_BUILD_NAME,
-                  CAMHAL_GIT_UNCOMMIT_FILE_NUM );
+                  CAMHAL_GIT_UNCOMMIT_FILE_NUM,
+                  CAMHAL_IP, CAMHAL_PATH, CAMHAL_HOSTNAME
+                  );
 #endif
     return num_cameras;
 }
@@ -901,7 +917,7 @@ int camera_get_camera_info(int camera_id, struct camera_info *info)
     const char *valstr = NULL;
     android::CameraProperties::Properties* properties = NULL;
 
-    LOGD("camera_get_camera_info camera_id=%d", camera_id);
+    CAMHAL_LOGDB("camera_get_camera_info camera_id=%d", camera_id);
     // this going to be the first call from camera service
     // initialize camera properties here...
     if( ( gCamerasOpen == 0 ) 
@@ -914,7 +930,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_LOGEA("Couldn't get camera properties");
         rv = -EINVAL;
         goto end;
     }
diff --git a/CameraParameters.cpp b/CameraParameters.cpp
index 8137b8c..9391cc8 100755
--- a/CameraParameters.cpp
+++ b/CameraParameters.cpp
@@ -15,6 +15,7 @@
  */
 
 
+#define LOG_TAG "CAMHAL_CameraParameters"
 #include "CameraHal.h"
 #include "CameraProperties.h"
 
@@ -164,7 +165,7 @@ void CameraProperties::Properties::dump()
 {
     for (size_t i = 0; i < mProperties->size(); i++)
     {
-        CAMHAL_LOGDB("%s = %s\n",
+        CAMHAL_LOGVB("%s = %s\n",
                         mProperties->keyAt(i).string(),
                         mProperties->valueAt(i).string());
     }
diff --git a/CameraProperties.cpp b/CameraProperties.cpp
index 72191a6..5ee7b48 100755
--- a/CameraProperties.cpp
+++ b/CameraProperties.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
-#define LOG_TAG "CameraProperties"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CameraProperties       "
 
 //#include "CameraHal.h"
 #include <utils/threads.h>
@@ -28,11 +28,6 @@
 
 namespace android {
 
-#define LOGD ALOGD
-#define LOGV ALOGV
-#define LOGE ALOGE
-#define LOGI ALOGI
-
 extern "C" int CameraAdapter_CameraNum();
 extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params);
 
@@ -57,7 +52,6 @@ CameraProperties::~CameraProperties()
     LOG_FUNCTION_NAME_EXIT;
 }
 
-
 // Initializes the CameraProperties class
 status_t CameraProperties::initialize(int cameraid)
 {
@@ -67,30 +61,27 @@ status_t CameraProperties::initialize(int cameraid)
 
     Mutex::Autolock lock(mLock);
 
-    LOGD("%s\n", mInitialized?"initialized":"no initialize");
+    CAMHAL_LOGDB("%s, mCamerasSupported=%d\n",
+            mInitialized?"initialized":"no initialize", mCamerasSupported);
 
-    LOGD("mCamerasSupported=%d\n", mCamerasSupported);
     if( !mInitialized ){
 
-        LOGD("no initialized loadCaps all\n");
         int temp = CameraAdapter_CameraNum();
         for ( int i = 0; i < temp; i++) {
-            LOGD("mCameraProps[%d]=%p\n", i, &mCameraProps[i]);
             mInitialized |= (1 << cameraid);
-			mCamerasSupported ++;
-			mCameraProps[i].set(CameraProperties::CAMERA_SENSOR_INDEX, i);
+            mCamerasSupported ++;
+            mCameraProps[i].set(CameraProperties::CAMERA_SENSOR_INDEX, i);
             loadCaps(i, &mCameraProps[i]);
             mCameraProps[i].dump();
         }
 
     }else{
 
-        if(!strcmp( mCameraProps[cameraid].get(CameraProperties::RELOAD_WHEN_OPEN), "1") ){
-                LOGD("re loadCaps again\n");
-                LOGD("mCameraProps[%d]=%p\n", cameraid, &mCameraProps[cameraid]);
-                loadCaps(cameraid, &mCameraProps[cameraid]);
+        if(!strcmp( mCameraProps[cameraid].get(CameraProperties::RELOAD_WHEN_OPEN), "1")){
+            CAMHAL_LOGDB("cameraid %d reload\n", cameraid);
+            loadCaps(cameraid, &mCameraProps[cameraid]);
         }else{
-            LOGD("%s,%d, device dont need reload return\n", __func__, __LINE__); 
+            CAMHAL_LOGDA("device don't need reload\n"); 
         }
 
     }
@@ -110,7 +101,7 @@ status_t CameraProperties::loadProperties()
     LOG_FUNCTION_NAME;
 
     status_t ret = NO_ERROR;
-    LOGD("%s,%d,this func delete!!!\n", __func__, __LINE__); 
+    CAMHAL_LOGDA("this func delete!!!\n"); 
     return ret;
 }
 
diff --git a/Encoder_libjpeg.cpp b/Encoder_libjpeg.cpp
index 58cc936..8eaf885 100755
--- a/Encoder_libjpeg.cpp
+++ b/Encoder_libjpeg.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#define LOG_TAG "CameraHAL"
+#define LOG_TAG "CameraHAL_Encderlibjpeg"
 
 #include "CameraHal.h"
 #include "Encoder_libjpeg.h"
diff --git a/ExCameraParameters.cpp b/ExCameraParameters.cpp
index ecd5eb7..b1c23be 100755
--- a/ExCameraParameters.cpp
+++ b/ExCameraParameters.cpp
@@ -17,7 +17,7 @@
 
 
 
-#define LOG_TAG "CameraHAL"
+#define LOG_TAG "CAMHAL_ExCamParameters "
 #include <utils/Log.h>
 
 #include <string.h>
diff --git a/MemoryManager.cpp b/MemoryManager.cpp
index bb8c4c9..f52bb05 100755
--- a/MemoryManager.cpp
+++ b/MemoryManager.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "MemoryManager"
+#define LOG_TAG "CAMHAL_MemoryManager   "
 
 #include "CameraHal.h"
 #include "ExCameraParameters.h"
@@ -81,7 +81,7 @@ void* MemoryManager::allocateBuffer(int width, int height, const char* format, i
         return (void*)bufsArr;
 
 error:
-    LOGE("Freeing buffers already allocated after error occurred");
+    CAMHAL_LOGEA("Freeing buffers already allocated after error occurred");
     freeBuffer(bufsArr);
 
     if ( NULL != mErrorNotifier.get() )
diff --git a/NV12_resize.c b/NV12_resize.c
index 5153ecc..4fc0443 100644..100755
--- a/NV12_resize.c
+++ b/NV12_resize.c
@@ -1,13 +1,8 @@
 #include "NV12_resize.h"
+#include "DebugUtils.h"
 
 //#define LOG_NDEBUG 0
-#define LOG_NIDEBUG 0
-#define LOG_NDDEBUG 0
-#define LOGV  ALOGV
-#define LOGE  ALOGE
-#define LOGI  ALOGI
-#define LOD    ALOGD
-#define LOG_TAG "NV12_resize"
+#define LOG_TAG "CAMHAL_NV12_resize     "
 #define STRIDE 4096
 #include <utils/Log.h>
 
@@ -34,7 +29,7 @@ VT_resizeFrame_Video_opt2_lp
  mmUint16 dummy                         /* Transparent pixel value              */
  )
 {
-  LOGV("VT_resizeFrame_Video_opt2_lp+");
+  CAMHAL_LOGVA("VT_resizeFrame_Video_opt2_lp+");
 
   mmUint16 row,col;
   mmUint32 resizeFactorX;
@@ -58,19 +53,18 @@ 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_LOGVB("(i_img_ptr->uHeight == o_img_ptr->uHeight)\n"
+				        "i_img_ptr->width = %d,i_img_ptr->uHeight = %d\n" 
+				        "o_img_ptr->width = %d,o_img_ptr->uHeight = %d\n",
+                                        i_img_ptr->uWidth, i_img_ptr->uHeight,
+                                        o_img_ptr->uWidth, 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_LOGEA("Image Point NULL");
 	return FALSE;
   }
 
@@ -98,8 +92,7 @@ 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_LOGEB("idx or idy less then 1 idx = %d idy = %d stride = %d", idx, idy, i_img_ptr->uStride);
 	return FALSE;
 	}
 
@@ -300,11 +293,8 @@ VT_resizeFrame_Video_opt2_lp
   }
   else
   {
-	LOGE("eFormat not supported");
-	LOGV("VT_resizeFrame_Video_opt2_lp-");
+	CAMHAL_LOGEA("eFormat not supported");
 	return FALSE;
   }
-  LOGV("success");
-  LOGV("VT_resizeFrame_Video_opt2_lp-");
   return TRUE;
 }
diff --git a/SensorListener.cpp b/SensorListener.cpp
index 3f84ce3..adcb7b8 100755
--- a/SensorListener.cpp
+++ b/SensorListener.cpp
@@ -21,7 +21,7 @@
 *
 */
 
-#define LOG_TAG "CameraHAL"
+#define LOG_TAG "CameraHALSensorLstenner"
 
 #include "SensorListener.h"
 #include "CameraHal.h"
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp
index 47fbb67..0f45002 100755
--- a/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -21,8 +21,8 @@
 *
 */
 
-#define LOG_NDEBUG 0
-#define LOG_TAG "V4LCameraAdapter"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CAMHAL_V4LCameraAdapter"
 //reinclude because of a bug with the log macros
 #include <utils/Log.h>
 #include "DebugUtils.h"
@@ -61,8 +61,6 @@ static int iCamerasNum = -1;
 
 #define Q16_OFFSET 16
 
-#define HERE(Msg) {CAMHAL_LOGEB("--===line %d, %s===--\n", __LINE__, Msg);}
-
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
@@ -82,16 +80,6 @@ const char *SENSOR_PATH[]={
 
 namespace android {
 
-#undef LOG_TAG
-///Maintain a separate tag for V4LCameraAdapter logs to isolate issues
-#define LOG_TAG "V4LCameraAdapter"
-
-//redefine because of a bug with the log macros
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME           LOGV("%d: %s() ENTER", __LINE__, __FUNCTION__);
-#define LOG_FUNCTION_NAME_EXIT      LOGV("%d: %s() EXIT", __LINE__, __FUNCTION__);
-
 //frames skipped before recalculating the framerate
 #define FPS_PERIOD 30
 
@@ -131,19 +119,21 @@ static int writefile(char* path,char* content)
 {
     FILE* fp = fopen(path, "w+");
 
-    LOGD("Write file %s(%p) content %s", path, fp, content);
+    CAMHAL_LOGDB("Write file %s(%p) content %s", path, fp, content);
 
     if (fp) {
         while( ((*content) != '\0') ) {
-            if (EOF == fputc(*content,fp))
-                LOGD("write char fail");
+            if (EOF == fputc(*content,fp)){
+               CAMHAL_LOGDA("write char fail");
+            }
             content++;
         }
 
         fclose(fp);
     }
-    else
-        LOGD("open file fail\n");
+    else{
+        CAMHAL_LOGDA("open file fail\n");
+    }
     return 1;
 }
 #endif
@@ -162,7 +152,6 @@ status_t V4LCameraAdapter::initialize(CameraProperties::Properties* caps)
     LOG_FUNCTION_NAME;
 
     char value[PROPERTY_VALUE_MAX];
-    char fileflag[8];
     property_get("debug.camera.showfps", value, "0");
     mDebugFps = atoi(value);
 
@@ -253,7 +242,7 @@ status_t V4LCameraAdapter::initialize(CameraProperties::Properties* caps)
         mbFrontCamera = true;
     else
         mbFrontCamera = false;
-    LOGD("mbFrontCamera=%d",mbFrontCamera);
+    CAMHAL_LOGDB("mbFrontCamera=%d",mbFrontCamera);
 
     // Initialize flags
     mPreviewing = false;
@@ -349,8 +338,9 @@ status_t V4LCameraAdapter::IoctlStateProbe(void)
 	mIoctlSupport |= IOCTL_MASK_ROTATE;
     }
     
-    if(mIoctlSupport & IOCTL_MASK_ROTATE)
+    if(mIoctlSupport & IOCTL_MASK_ROTATE){
 	CAMHAL_LOGDB("camera %d support capture rotate",mSensorIndex);
+    }
     mRotateValue = 0;
 #endif
 
@@ -513,7 +503,7 @@ status_t V4LCameraAdapter::setParameters(const CameraParameters &params)
 
     if(zoom > maxzoom){
         rtn = INVALID_OPERATION;
-        CAMHAL_LOGEB("Zoom Parameter Out of range1------zoom level:%d,max level:%d",zoom,maxzoom);
+        CAMHAL_LOGDB("Zoom Out of range, level:%d,max:%d",zoom,maxzoom);
         zoom = maxzoom;
         mParams.set((const char*)CameraParameters::KEY_ZOOM, maxzoom);
     }else if(zoom <0) {
@@ -732,8 +722,8 @@ status_t V4LCameraAdapter::setBuffersFormat(int width, int height, int pixelform
 
     ret = ioctl(mCameraHandle, VIDIOC_S_FMT, &mVideoInfo->format);
     if (ret < 0) {
-        CAMHAL_LOGEB("Open: VIDIOC_S_FMT Failed: %s", strerror(errno));
-        LOGD("ret=%d", ret);
+        CAMHAL_LOGEB("Open: VIDIOC_S_FMT Failed: %s, ret=%d\n",
+                        strerror(errno), ret);
         return ret;
     }
 
@@ -750,14 +740,13 @@ status_t V4LCameraAdapter::getBuffersFormat(int &width, int &height, int &pixelf
     format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     ret = ioctl(mCameraHandle, VIDIOC_G_FMT, &format);
     if (ret < 0) {
-        CAMHAL_LOGEB("Open: VIDIOC_G_FMT Failed: %s", strerror(errno));
-        LOGD("ret=%d", ret);
+        CAMHAL_LOGDB("Open: VIDIOC_G_FMT Failed: %s", strerror(errno));
         return ret;
     }
     width = format.fmt.pix.width;
     height = format.fmt.pix.height;
     pixelformat = format.fmt.pix.pixelformat;
-    CAMHAL_LOGDB("Get BufferFormat Width * Height %d x %d format 0x%x", width, height, pixelformat);	
+    CAMHAL_LOGDB("VIDIOC_G_FMT, w*h: %5dx%5d, format 0x%x", width, height, pixelformat);	
     return ret;
 }
 
@@ -832,7 +821,6 @@ status_t V4LCameraAdapter::UseBuffersPreview(void* bufArr, int num)
 #ifdef AMLOGIC_USB_CAMERA_SUPPORT
     ret = setBuffersFormat(width, height, V4L2_PIX_FMT_YUYV);//
     if( 0 > ret ){
-        CAMHAL_LOGEB("VIDIOC_S_FMT failed: %s", strerror(errno));
         return BAD_VALUE;
     }
 #else
@@ -880,7 +868,7 @@ status_t V4LCameraAdapter::UseBuffersPreview(void* bufArr, int num)
         uint32_t *ptr = (uint32_t*) bufArr;
 
         //Associate each Camera internal buffer with the one from Overlay
-        LOGD("mPreviewBufs.add %#x, %d", ptr[i], i);
+        CAMHAL_LOGDB("mPreviewBufs.add %#x, %d", ptr[i], i);
         mPreviewBufs.add((int)ptr[i], i);
 
     }
@@ -892,9 +880,7 @@ status_t V4LCameraAdapter::UseBuffersPreview(void* bufArr, int num)
 
     // Update the preview buffer count
     mPreviewBufferCount = num;
-#ifdef AMLOGIC_USB_CAMERA_SUPPORT
-    mUsbCameraStatus = USBCAMERA_ACTIVED;
-#endif
+
     return ret;
 }
 
@@ -902,6 +888,8 @@ status_t V4LCameraAdapter::UseBuffersCapture(void* bufArr, int num)
 {
     int ret = NO_ERROR;
 
+    LOG_FUNCTION_NAME
+
     if(NULL == bufArr)
     {
         return BAD_VALUE;
@@ -909,13 +897,12 @@ status_t V4LCameraAdapter::UseBuffersCapture(void* bufArr, int num)
 
     if (num != 1)
     {
-        LOGD("----------------- UseBuffersCapture num=%d", num);
+        CAMHAL_LOGDB("num=%d\n", num);
     }
 
     /* This will only be called right before taking a picture, so
      * stop preview now so that we can set buffer format here.
      */
-    LOGD("UseBuffersCapture stopPreview..");
     this->stopPreview();
 
 #ifdef AMLOGIC_USB_CAMERA_SUPPORT
@@ -956,7 +943,6 @@ status_t V4LCameraAdapter::UseBuffersCapture(void* bufArr, int num)
     }
 #endif
 
-    LOGD("UseBuffersCapture setBuffersFormat..");
     int width, height;
     mParams.getPictureSize(&width, &height);
     mCaptureWidth = width;
@@ -1018,13 +1004,14 @@ status_t V4LCameraAdapter::UseBuffersCapture(void* bufArr, int num)
         }
 
         uint32_t *ptr = (uint32_t*) bufArr;
-        LOGV("UseBuffersCapture %#x", ptr[0]);
         mCaptureBuf = (camera_memory_t*)ptr[0];
+        CAMHAL_LOGDB("UseBuffersCapture %#x", ptr[0]);
     }
 
 #ifdef AMLOGIC_USB_CAMERA_SUPPORT
     mUsbCameraStatus = USBCAMERA_ACTIVED;
 #endif
+    LOG_FUNCTION_NAME_EXIT
     return ret;
 }
 
@@ -1066,8 +1053,9 @@ int V4LCameraAdapter::beginAutoFocusThread(void *cookie)
     	set_flash_mode( c->mCameraHandle, "off");
     }
     if(ret < 0) {
-	if( c->mIoctlSupport & IOCTL_MASK_FOCUS)
-		 CAMHAL_LOGEA("AUTO FOCUS Failed");
+	if( c->mIoctlSupport & IOCTL_MASK_FOCUS){
+		 CAMHAL_LOGDA("AUTO FOCUS Failed");
+        }
         c->notifyFocusSubscribers(false);
     } else {
         c->notifyFocusSubscribers(true);
@@ -1114,7 +1102,7 @@ status_t V4LCameraAdapter::cancelAutoFocus()
         ctl.value = CAM_FOCUS_MODE_RELEASE;
         ret = ioctl(mCameraHandle, VIDIOC_S_CTRL, &ctl);
         if(ret < 0) {
-		CAMHAL_LOGEA("AUTO FOCUS Failed");
+		CAMHAL_LOGDA("AUTO FOCUS Failed");
         }
     }else if( CAM_FOCUS_MODE_AUTO == cur_focus_mode_for_conti){
     	if(CAM_FOCUS_MODE_INFINITY != cur_focus_mode){
@@ -1239,6 +1227,7 @@ status_t V4LCameraAdapter::stopPreview()
     enum v4l2_buf_type bufType;
     int ret = NO_ERROR;
 
+    LOG_FUNCTION_NAME
     Mutex::Autolock lock(mPreviewBufsLock);
     if(!mPreviewing)
     {
@@ -1251,7 +1240,6 @@ status_t V4LCameraAdapter::stopPreview()
     mPreviewThread.clear();
 
 
-    CAMHAL_LOGDA("stopPreview streamoff..\n");
     if (mVideoInfo->isStreaming) {
         bufType = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
@@ -1282,11 +1270,12 @@ status_t V4LCameraAdapter::stopPreview()
 	cur_focus_mode_for_conti = CAM_FOCUS_MODE_RELEASE;
     }
 
-    LOGD("stopPreview unmap..");
     /* Unmap buffers */
-    for (int i = 0; i < mPreviewBufferCount; i++)
-        if (munmap(mVideoInfo->mem[i], mVideoInfo->buf.length) < 0)
+    for (int i = 0; i < mPreviewBufferCount; i++){
+        if (munmap(mVideoInfo->mem[i], mVideoInfo->buf.length) < 0){
             CAMHAL_LOGEA("Unmap failed");
+        }
+    }
 
 
 #ifdef AMLOGIC_USB_CAMERA_SUPPORT
@@ -1303,9 +1292,9 @@ status_t V4LCameraAdapter::stopPreview()
     }
 #endif
 
-    LOGD("stopPreview clearexit..");
     mPreviewBufs.clear();
     mPreviewIdxs.clear();
+    LOG_FUNCTION_NAME_EXIT
     return ret;
 
 }
@@ -1399,7 +1388,7 @@ static void debugShowFPS()
         mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
         mLastFpsTime = now;
         mLastFrameCount = mFrameCount;
-        LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
+        CAMHAL_LOGDB("Camera %d Frames, %f FPS", mFrameCount, mFps);
     }
     // XXX: mFPS has the value we want
 }
@@ -1517,7 +1506,7 @@ int V4LCameraAdapter::previewThread()
 	if(!fp){
 	    int previewFrameRate = mParams.getPreviewFrameRate();
 	    delay = (unsigned)(1000000.0f / float(previewFrameRate)) >> 1;
-	    CAMHAL_LOGEB("Preview thread get frame fail, need sleep:%d",delay);
+	    CAMHAL_LOGDB("Preview thread get frame fail, need sleep:%d",delay);
 	    usleep(delay);
 	    return BAD_VALUE;
 	}
@@ -1609,9 +1598,9 @@ int V4LCameraAdapter::previewThread()
         frame.mTimestamp = systemTime(SYSTEM_TIME_MONOTONIC);
         frame.mPixelFmt = mPixelFormat;
         ret = setInitFrameRefCount(frame.mBuffer, frame.mFrameMask);
-        if (ret)
-            LOGE("setInitFrameRefCount err=%d", ret);
-        else
+        if (ret){
+            CAMHAL_LOGEB("setInitFrameRefCount err=%d", ret);
+        }else
             ret = sendFrameToSubscribers(&frame);
         //LOGD("previewThread /sendFrameToSubscribers ret=%d", ret);           
     }
@@ -1637,7 +1626,7 @@ int V4LCameraAdapter::GenExif(ExifElementsTable* exiftable)
     //Image orientation
     int orientation = mParams.getInt(CameraParameters::KEY_ROTATION);
     //covert 0 90 180 270 to 0 1 2 3
-    LOGE("get orientaion %d",orientation);
+    CAMHAL_LOGDB("get orientaion %d",orientation);
     if(orientation == 0)
         orientation = 1;
     else if(orientation == 90)
@@ -1927,8 +1916,10 @@ int V4LCameraAdapter::pictureThread()
         }
 #endif
         
-        LOGD("pictureThread mCaptureBuf=%#x dest=%#x fp=%#x width=%d height=%d", (uint32_t)mCaptureBuf, (uint32_t)dest, (uint32_t)fp, width, height);
-        LOGD("length=%d bytesused=%d index=%d", mVideoInfo->buf.length, mVideoInfo->buf.bytesused, index);
+        CAMHAL_LOGDB("mCaptureBuf=%p,dest=%p,fp=%p,index=%d\n"
+                     "w=%d h=%d,len=%d,bytesused=%d\n",
+                     mCaptureBuf, dest, fp,index, width, height,
+                     mVideoInfo->buf.length, mVideoInfo->buf.bytesused);
 
         if(DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT == V4L2_PIX_FMT_RGB24){ // rgb24
             frame.mLength = width*height*3;
@@ -1999,8 +1990,9 @@ int V4LCameraAdapter::pictureThread()
         nDequeued = 0;
 
         /* Unmap buffers */
-        if (munmap(mVideoInfo->mem[0], mVideoInfo->buf.length) < 0)
+        if (munmap(mVideoInfo->mem[0], mVideoInfo->buf.length) < 0){
             CAMHAL_LOGEA("Unmap failed");
+        }
 
 
 #ifdef AMLOGIC_USB_CAMERA_SUPPORT
@@ -2037,10 +2029,11 @@ int V4LCameraAdapter::pictureThread()
     startPreview();
 
     ret = setInitFrameRefCount(frame.mBuffer, frame.mFrameMask);
-    if (ret)
-        LOGE("setInitFrameRefCount err=%d", ret);
-    else
+    if (ret){
+        CAMHAL_LOGEB("setInitFrameRefCount err=%d", ret);
+    }else{
         ret = sendFrameToSubscribers(&frame);
+    }
     //LOGD("pictureThread /sendFrameToSubscribers ret=%d", ret);
 
     return ret;
@@ -2048,7 +2041,7 @@ int V4LCameraAdapter::pictureThread()
 
 
 status_t V4LCameraAdapter::disableMirror(bool bDisable) {
-    LOGD("disableMirror %d",bDisable);
+    CAMHAL_LOGDB("disableMirror %d\n",bDisable);
     mbDisableMirror = bDisable;
     setMirrorEffect();
     return NO_ERROR;
@@ -2058,7 +2051,7 @@ status_t V4LCameraAdapter::setMirrorEffect() {
 #ifndef AMLOGIC_USB_CAMERA_SUPPORT
 
     bool bEnable = mbFrontCamera&&(!mbDisableMirror);
-    LOGD("setmirror effect %d",bEnable);
+    CAMHAL_LOGDB("setmirror effect %d",bEnable);
     
     if(mIoctlSupport & IOCTL_MASK_HFLIP){
         if(set_hflip_mode(mCameraHandle,bEnable))
@@ -2133,12 +2126,12 @@ extern "C" int CameraAdapter_Capabilities(CameraProperties::Properties* properti
 extern "C"  int CameraAdapter_CameraNum()
 {
 #if defined(AMLOGIC_FRONT_CAMERA_SUPPORT) || defined(AMLOGIC_BACK_CAMERA_SUPPORT)
-    LOGD("CameraAdapter_CameraNum %d",MAX_CAMERAS_SUPPORTED);
-	#ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
-	return MAX_CAM_NUM_ADD_VCAM;
-	#else
+    CAMHAL_LOGDB("CameraAdapter_CameraNum %d",MAX_CAMERAS_SUPPORTED);
+#ifdef AMLOGIC_VIRTUAL_CAMERA_SUPPORT
+    return MAX_CAM_NUM_ADD_VCAM;
+#else
     return MAX_CAMERAS_SUPPORTED;
-	#endif
+#endif
 #elif  defined ( AMLOGIC_VIRTUAL_CAMERA_SUPPORT)
     iCamerasNum = 0;
     for( int i = 0; i < (int)ARRAY_SIZE(SENSOR_PATH); i++ )
@@ -2149,8 +2142,8 @@ extern "C"  int CameraAdapter_CameraNum()
 	}
     }
 
-    LOGD("GetCameraNums %d\n", iCamerasNum+1);
-	return iCamerasNum+1;
+    CAMHAL_LOGDB("GetCameraNums %d\n", iCamerasNum+1);
+    return iCamerasNum+1;
 #elif  defined (AMLOGIC_USB_CAMERA_SUPPORT)
     iCamerasNum = 0;
     for( int i = 0; i < (int)ARRAY_SIZE(SENSOR_PATH); i++ )
@@ -2164,7 +2157,7 @@ extern "C"  int CameraAdapter_CameraNum()
 			MAX_CAMERAS_SUPPORTED :iCamerasNum;
     return iCamerasNum;
 #else
-    LOGD("CameraAdapter_CameraNum %d",iCamerasNum);
+    CAMHAL_LOGDB("CameraAdapter_CameraNum %d",iCamerasNum);
     if(iCamerasNum == -1)
     {
         iCamerasNum = 0;
@@ -2175,7 +2168,7 @@ extern "C"  int CameraAdapter_CameraNum()
                 iCamerasNum++;
             }
         }
-        LOGD("GetCameraNums %d",iCamerasNum);
+        CAMHAL_LOGDB("GetCameraNums %d",iCamerasNum);
     }
 
     return iCamerasNum;
@@ -2515,23 +2508,16 @@ static bool getCameraAutoFocus(int camera_fd, char* focus_mode_str, char*def_foc
     int menu_num = 0;
     int mode_count = 0;
 
-    if((!focus_mode_str)||(!def_focus_mode)){
-        CAMHAL_LOGEA("focus mode str buf error");
-        return auto_focus_enable;
-    }
-
-
-    if(camera_fd<0){
-        CAMHAL_LOGEA("camera handle is invaild");
-        return auto_focus_enable;
-    }
-
     memset(&qc, 0, sizeof(struct v4l2_queryctrl));
     qc.id = V4L2_CID_FOCUS_AUTO;
     menu_num = ioctl (camera_fd, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( menu_num < 0) || (qc.type != V4L2_CTRL_TYPE_MENU)){
         auto_focus_enable = false;
-        CAMHAL_LOGDB("camera handle %d can't support auto focus",camera_fd);
+        CAMHAL_LOGDB("can't support auto focus,%sret=%d%s\n",
+                qc.flags == V4L2_CTRL_FLAG_DISABLED?"disable,":"",
+                menu_num,
+                qc.type == V4L2_CTRL_TYPE_MENU? "":",type not right");
+
     }else {
         memset(&qm, 0, sizeof(qm));
         qm.id = V4L2_CID_FOCUS_AUTO;
@@ -2566,24 +2552,15 @@ static bool getCameraFocusArea(int camera_fd, char* max_num_focus_area,
     int x1 = 0;
     int y1 = 0;
 
-    if((!max_num_focus_area)||(!focus_area)){
-        CAMHAL_LOGEA("focus area str buf error");
-        return false;
-    }
-
-
-    if(camera_fd<0){
-        CAMHAL_LOGEA("camera handle is invaild");
-        return false;
-    }
-
-
     memset(&qc, 0, sizeof(struct v4l2_queryctrl));
     qc.id = V4L2_CID_FOCUS_ABSOLUTE;
     ret = ioctl (camera_fd, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( ret < 0) 
             || (qc.type != V4L2_CTRL_TYPE_INTEGER)){
-        CAMHAL_LOGDB("camera handle %d can't support auto focus",camera_fd);
+        CAMHAL_LOGDB("can't support touch focus,%sret=%d%s\n",
+                qc.flags == V4L2_CTRL_FLAG_DISABLED? "disble,":"",
+                ret,
+                qc.type == V4L2_CTRL_TYPE_INTEGER?"":", type not right");
         return false;
     }
 
@@ -2712,7 +2689,7 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
 	//get preview size & set
     char *sizes = (char *) calloc (1, 1024);
     if(!sizes){
-        CAMHAL_LOGEA("Alloc string buff error!");
+        CAMHAL_LOGDA("Alloc string buff error!");
         return;
     }        
 
@@ -2735,14 +2712,15 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
 			camera_id++;
 		}
 		if(camera_id >= (int)ARRAY_SIZE(SENSOR_PATH)){
-			CAMHAL_LOGEB("failed to opening Camera when loadCaps: %s", strerror(errno));
+			CAMHAL_LOGDB("failed to opening Camera when loadCaps: %s", strerror(errno));
 		}
 #endif
 #else
     camera_fd = open(DEVICE_PATH(camera_id), O_RDWR);
 #endif
-    if(camera_fd<0)
-        CAMHAL_LOGEB("open camera %d error when loadcaps",camera_id);
+    if(camera_fd<0){
+        CAMHAL_LOGDB("open camera %d error when loadcaps",camera_id);
+    }
     
 #ifdef AMLOGIC_CAMERA_NONBLOCK_SUPPORT
     int fps=0, fps_num=0;
@@ -2769,8 +2747,9 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
 	    sprintf(fpsrange,"%s%d","5000,",fps*1000/fps_num);
 	    params->set(CameraProperties::FRAMERATE_RANGE, fpsrange);
     }else{
-	    if(NO_ERROR != ret)
-		    CAMHAL_LOGDA("sensor driver need to implement enum framerate func!!!\n");
+	    if(NO_ERROR != ret){
+                    CAMHAL_LOGDA("sensor driver need to implement enum framerate func!!!\n");
+            }
 	    params->set(CameraProperties::SUPPORTED_PREVIEW_FRAME_RATES, "5,15");
 	    params->set(CameraProperties::PREVIEW_FRAME_RATE, "15");
 
@@ -3270,8 +3249,9 @@ extern "C" int V4LCameraAdapter::set_white_balance(int camera_fd,const char *swb
 	mWhiteBalance = ctl.value;
     }
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set white balance fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("AMLOGIC CAMERA Set white balance fail: %s. ret=%d", strerror(errno),ret);
+    }
     return ret ;
 }
 
@@ -3368,7 +3348,7 @@ extern "C" int V4LCameraAdapter::SetExposureMode(int camera_fd, unsigned int mod
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
     if(ret<0)
     {
-	CAMHAL_LOGEB("AMLOGIC CAMERA Set SetExposureMode fail: %s. ret=%d", strerror(errno),ret);
+	CAMHAL_LOGDB("fail: %s. ret=%d", strerror(errno),ret);
 	return ret;
     }
     if( (V4L2_EXPOSURE_APERTURE_PRIORITY ==ctl.value)
@@ -3378,7 +3358,8 @@ extern "C" int V4LCameraAdapter::SetExposureMode(int camera_fd, unsigned int mod
 	    ctl.value = true;
 	    ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
 	    if(ret<0){
-		CAMHAL_LOGEB("Exposure auto priority Set manual fail: %s. ret=%d", strerror(errno),ret);
+		CAMHAL_LOGDB("Exposure auto priority Set manual fail: %s. ret=%d",
+                                strerror(errno),ret);
 		return ret;
 	    }
     }
@@ -3411,14 +3392,14 @@ extern "C" int V4LCameraAdapter::SetExposure(int camera_fd,const char *sbn)
 	    ret = SetExposureMode( camera_fd, V4L2_EXPOSURE_MANUAL);
 	    if(ret<0)
 	    {
-		CAMHAL_LOGEA("Exposure Mode change to manual mode failure\n");
+		CAMHAL_LOGDA("Exposure Mode change to manual mode failure\n");
 		return ret;
 	    }
     }else{
 	    ret = SetExposureMode( camera_fd, V4L2_EXPOSURE_APERTURE_PRIORITY);// 3);
 	    if(ret<0)
 	    {
-		CAMHAL_LOGEA("Exposure Mode change to Aperture mode failure\n");
+		CAMHAL_LOGDA("Exposure Mode change to Aperture mode failure\n");
 	    }
 	return ret;//APERTURE mode cann't set followed control
     }
@@ -3440,8 +3421,9 @@ extern "C" int V4LCameraAdapter::SetExposure(int camera_fd,const char *sbn)
 #endif
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set Exposure fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("AMLOGIC CAMERA Set Exposure fail: %s. ret=%d", strerror(errno),ret);
+    }
 
     return ret ;
 }
@@ -3463,8 +3445,9 @@ extern "C" int set_effect(int camera_fd,const char *sef)
     else if(strcasecmp(sef,"sepia")==0)
         ctl.value=CAM_EFFECT_ENC_SEPIA;
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set effect fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set effect fail: %s. ret=%d", strerror(errno),ret);
+    }
      return ret ;
 }
 
@@ -3484,8 +3467,9 @@ extern "C" int set_night_mode(int camera_fd,const char *snm)
     ctl.id = V4L2_CID_DO_WHITE_BALANCE;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set night mode fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set night mode fail: %s. ret=%d", strerror(errno),ret);
+    }
      return ret ;
 }
 
@@ -3516,7 +3500,7 @@ extern "C" int V4LCameraAdapter::set_banding(int camera_fd,const char *snm)
     }
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
     if(ret<0){
-       	CAMHAL_LOGEB("AMLOGIC CAMERA Set banding fail: %s. ret=%d", strerror(errno),ret);
+        CAMHAL_LOGDB("Set banding fail: %s. ret=%d", strerror(errno),ret);
     }
     return ret ;
 }
@@ -3530,22 +3514,14 @@ static bool get_flash_mode(int camera_fd, char *flash_status,
     int ret = NO_ERROR;
     int status_count = 0;
 
-    if((!flash_status)||(!def_flash_status)){
-        CAMHAL_LOGEA("flash status str buf error\n");
-        return flash_enable;
-    }
-
-    if(camera_fd<0){
-        CAMHAL_LOGEA("camera handle is invalid\n");
-        return flash_enable;
-    }
-
     memset(&qc, 0, sizeof(qc));
     qc.id = V4L2_CID_BACKLIGHT_COMPENSATION;
     ret = ioctl (camera_fd, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( ret < 0) || (qc.type != V4L2_CTRL_TYPE_MENU)){
         flash_enable = false;
-        CAMHAL_LOGDB("camera handle %d can't support flash\n",camera_fd);
+        CAMHAL_LOGDB("can't support flash, %sret=%d%s\n",
+                (qc.flags == V4L2_CTRL_FLAG_DISABLED)?"disable,":"",
+                ret,  (qc.type != V4L2_CTRL_TYPE_MENU)?"":",type not right");
     }else {
         memset(&qm, 0, sizeof(qm));
         qm.id = V4L2_CID_BACKLIGHT_COMPENSATION;
@@ -3607,7 +3583,7 @@ static int get_hflip_mode(int camera_fd)
     int ret = 0;
 
     if(camera_fd<0){
-        CAMHAL_LOGEA("Get_hflip_mode --camera handle is invalid\n");
+        CAMHAL_LOGDA("Get_hflip_mode --camera handle is invalid\n");
         return -1;
     }
 
@@ -3616,7 +3592,9 @@ static int get_hflip_mode(int camera_fd)
     ret = ioctl (camera_fd, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( ret < 0) || (qc.type != V4L2_CTRL_TYPE_INTEGER)){
         ret = -1;
-        CAMHAL_LOGDB("camera handle %d can't support HFlip!\n",camera_fd);
+        CAMHAL_LOGDB("can't support HFlip! %s ret=%d %s\n",
+            (qc.flags == V4L2_CTRL_FLAG_DISABLED)?"disable,":"",
+            ret, (qc.type != V4L2_CTRL_TYPE_INTEGER)?"":",type not right");
     }else{
         CAMHAL_LOGDB("camera handle %d supports HFlip!\n",camera_fd);
     }
@@ -3637,8 +3615,9 @@ static int set_hflip_mode(int camera_fd, bool mode)
     ctl.id = V4L2_CID_HFLIP;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("Set hflip mode fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set hflip mode fail: %s. ret=%d", strerror(errno),ret);
+    }
     return ret ;
 }
 
@@ -3679,9 +3658,10 @@ static int set_zoom_level(int camera_fd, int zoom)
     ctl.value=zoom;
     ctl.id = V4L2_CID_ZOOM_ABSOLUTE;
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("Set zoom level fail: %s. ret=%d", strerror(errno),ret);
-     return ret ;
+    if(ret<0){
+        CAMHAL_LOGDB("Set zoom level fail: %s. ret=%d", strerror(errno),ret);
+    }
+    return ret ;
 }
 #ifndef AMLOGIC_USB_CAMERA_SUPPORT
 static int set_rotate_value(int camera_fd, int value)
@@ -3692,7 +3672,7 @@ static int set_rotate_value(int camera_fd, int value)
         return -1;
 
     if((value!=0)&&(value!=90)&&(value!=180)&&(value!=270)){
-        CAMHAL_LOGEB("Set rotate value invalid: %d.", value);
+        CAMHAL_LOGDB("Set rotate value invalid: %d.", value);
         return -1;
     }
 
@@ -3703,8 +3683,9 @@ static int set_rotate_value(int camera_fd, int value)
     ctl.id = V4L2_ROTATE_ID;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("Set rotate value fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set rotate value fail: %s. ret=%d", strerror(errno),ret);
+    }
     return ret ;
 }
 
diff --git a/inc/CameraHal.h b/inc/CameraHal.h
index e820ef0..5a2eceb 100755
--- a/inc/CameraHal.h
+++ b/inc/CameraHal.h
@@ -83,43 +83,6 @@
 //disable it now
 //#define ENABLE_SENSOR_LISTENER 1 
 
-//Uncomment to enable more verbose/debug logs
-#define DEBUG_LOG
-
-#define LOGE ALOGE
-#define LOGV ALOGV
-#define LOGI ALOGI
-#define LOGD ALOGD
-
-///Camera HAL Logging Functions
-#ifndef DEBUG_LOG
-
-#define CAMHAL_LOGDA(str)
-#define CAMHAL_LOGDB(str, ...)
-#define CAMHAL_LOGVA(str)
-#define CAMHAL_LOGVB(str, ...)
-
-#define CAMHAL_LOGEA LOGE
-#define CAMHAL_LOGEB LOGE
-
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME
-#define LOG_FUNCTION_NAME_EXIT
-
-#else
-
-#define CAMHAL_LOGDA DBGUTILS_LOGDA
-#define CAMHAL_LOGDB DBGUTILS_LOGDB
-#define CAMHAL_LOGVA DBGUTILS_LOGVA
-#define CAMHAL_LOGVB DBGUTILS_LOGVB
-
-#define CAMHAL_LOGEA DBGUTILS_LOGEA
-#define CAMHAL_LOGEB DBGUTILS_LOGEB
-
-#endif
-
-
 //#define AMLOGIC_CAMERA_OVERLAY_SUPPORT
 //#define AMLOGIC_USB_CAMERA_SUPPORT
 
diff --git a/utils/DebugUtils.h b/utils/DebugUtils.h
index f339117..f203eaa 100755
--- a/utils/DebugUtils.h
+++ b/utils/DebugUtils.h
@@ -14,23 +14,60 @@
  * limitations under the License.
  */
 
-
+/*
+use "dumpsys media.camera -t x" to change log level to x or
+use "adb shell dumpsys media.camera -t x" to change log level to x
+*/
 
 #ifndef DEBUG_UTILS_H
 #define DEBUG_UTILS_H
+#include <stdint.h>
 
-///Defines for debug statements - Macro LOG_TAG needs to be defined in the respective files
-#define DBGUTILS_LOGVA(str)         LOGV("%s:%d %s - " str,__FILE__, __LINE__,__FUNCTION__);
-#define DBGUTILS_LOGVB(str,...)     LOGV("%s:%d %s - " str,__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__);
-#define DBGUTILS_LOGDA(str)         LOGD("%s:%d %s - " str,__FILE__, __LINE__,__FUNCTION__);
-#define DBGUTILS_LOGDB(str, ...)    LOGD("%s:%d %s - " str,__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__);
-#define DBGUTILS_LOGEA(str)         LOGE("%s:%d %s - " str,__FILE__, __LINE__, __FUNCTION__);
-#define DBGUTILS_LOGEB(str, ...)    LOGE("%s:%d %s - " str,__FILE__, __LINE__,__FUNCTION__, __VA_ARGS__);
-#define LOG_FUNCTION_NAME           LOGV("%d: %s() ENTER", __LINE__, __FUNCTION__);
-#define LOG_FUNCTION_NAME_EXIT      LOGV("%d: %s() EXIT", __LINE__, __FUNCTION__);
+//Uncomment to enable more verbose/debug logs
+#define DEBUG_LOG
+extern volatile int32_t gCamHal_LogLevel;
 
+///Camera HAL Logging Functions
+#ifndef DEBUG_LOG
 
+#define CAMHAL_LOGDA(str)
+#define CAMHAL_LOGDB(str, ...)
+#define CAMHAL_LOGVA(str)
+#define CAMHAL_LOGVB(str, ...)
 
+#define CAMHAL_LOGIA ALOGD
+#define CAMHAL_LOGIB ALOGD
+#define CAMHAL_LOGWA ALOGE
+#define CAMHAL_LOGWB ALOGE
+#define CAMHAL_LOGEA ALOGE
+#define CAMHAL_LOGEB ALOGE
+#define CAMHAL_LOGFA ALOGE
+#define CAMHAL_LOGFB ALOGE
 
-#endif //DEBUG_UTILS_H
+#undef LOG_FUNCTION_NAME
+#undef LOG_FUNCTION_NAME_EXIT
+#define LOG_FUNCTION_NAME
+#define LOG_FUNCTION_NAME_EXIT
+
+#else
 
+///Defines for debug statements - Macro LOG_TAG needs to be defined in the respective files
+#define CAMHAL_LOGVA(str)         ALOGV_IF(gCamHal_LogLevel >=6,"%5d %s - " str, __LINE__,__FUNCTION__);
+#define CAMHAL_LOGVB(str,...)     ALOGV_IF(gCamHal_LogLevel >=6,"%5d %s - " str, __LINE__, __FUNCTION__, __VA_ARGS__);
+#define CAMHAL_LOGDA(str)         ALOGD_IF(gCamHal_LogLevel >=5,"%5d %s - " str, __LINE__,__FUNCTION__);
+#define CAMHAL_LOGDB(str, ...)    ALOGD_IF(gCamHal_LogLevel >=5,"%5d %s - " str, __LINE__, __FUNCTION__, __VA_ARGS__);
+#define CAMHAL_LOGIA(str)         ALOGI_IF(gCamHal_LogLevel >=4,"%5d %s - " str, __LINE__, __FUNCTION__);
+#define CAMHAL_LOGIB(str, ...)    ALOGI_IF(gCamHal_LogLevel >=4,"%5d %s - " str, __LINE__,__FUNCTION__, __VA_ARGS__);
+#define CAMHAL_LOGWA(str)         ALOGW_IF(gCamHal_LogLevel >=3,"%5d %s - " str, __LINE__, __FUNCTION__);
+#define CAMHAL_LOGWB(str, ...)    ALOGW_IF(gCamHal_LogLevel >=3,"%5d %s - " str, __LINE__,__FUNCTION__, __VA_ARGS__);
+#define CAMHAL_LOGEA(str)         ALOGE_IF(gCamHal_LogLevel >=2,"%5d %s - " str, __LINE__, __FUNCTION__);
+#define CAMHAL_LOGEB(str, ...)    ALOGE_IF(gCamHal_LogLevel >=2,"%5d %s - " str, __LINE__,__FUNCTION__, __VA_ARGS__);
+#define CAMHAL_LOGFA(str)         ALOGF_IF(gCamHal_LogLevel >=1,"%5d %s - " str, __LINE__, __FUNCTION__);
+#define CAMHAL_LOGFB(str, ...)    ALOGF_IF(gCamHal_LogLevel >=1,"%5d %s - " str, __LINE__,__FUNCTION__, __VA_ARGS__);
+
+#define LOG_FUNCTION_NAME         CAMHAL_LOGVA("ENTER");
+#define LOG_FUNCTION_NAME_EXIT    CAMHAL_LOGVA("EXIT");
+
+#endif
+
+#endif //DEBUG_UTILS_H
diff --git a/utils/MessageQueue.cpp b/utils/MessageQueue.cpp
index aad8d80..189aaa0 100755
--- a/utils/MessageQueue.cpp
+++ b/utils/MessageQueue.cpp
@@ -24,16 +24,12 @@
 
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "MessageQueue"
+#define LOG_TAG "CAMHAL_MessageQueue    "
 #include <utils/Log.h>
 #include "MessageQueue.h"
 
 namespace MSGUTILS {
 
-#define LOGD ALOGD
-#define LOGE ALOGE
-#define LOGI ALOGI
-#define LOGV ALOGV
 /**
    @brief Constructor for the message queue class
 
@@ -50,8 +46,7 @@ MessageQueue::MessageQueue()
     stat = pipe(fds);
     if ( 0 > stat )
     {
-	    LOGD("MessageQueue init fail");
-	    MSGQ_LOGEB("Error while openning pipe: %s", strerror(stat) );
+	    MSGQ_LOGEB("MessageQueue init fail: %s", strerror(stat) );
 	    this->fd_read = -1;
 	    this->fd_write = -1;
 	    mHasMsg = false;
@@ -103,7 +98,7 @@ android::status_t MessageQueue::get(Message* msg)
 
     if(!msg)
     {
-	    MSGQ_LOGEA("msg is NULL");
+	    MSGQ_LOGDA("msg is NULL");
 	    LOG_FUNCTION_NAME_EXIT;
 	    return android::BAD_VALUE;
     }
@@ -133,7 +128,7 @@ android::status_t MessageQueue::get(Message* msg)
         }
     }
 
-    MSGQ_LOGDB("MQ.get(%d,%p,%p,%p,%p)", msg->command, msg->arg1,msg->arg2,msg->arg3,msg->arg4);
+    MSGQ_LOGVB("MQ.get(%d,%p,%p,%p,%p)", msg->command, msg->arg1,msg->arg2,msg->arg3,msg->arg4);
 
     mHasMsg = false;
 
@@ -193,7 +188,7 @@ android::status_t MessageQueue::put(Message* msg)
 
     if(!msg)
     {
-	    MSGQ_LOGEA("msg is NULL");
+	    MSGQ_LOGDA("msg is NULL");
 	    LOG_FUNCTION_NAME_EXIT;
 	    return android::BAD_VALUE;
     }
@@ -206,7 +201,7 @@ android::status_t MessageQueue::put(Message* msg)
     }
 
 
-    MSGQ_LOGDB("MQ.put(%d,%p,%p,%p,%p)", msg->command, msg->arg1,msg->arg2,msg->arg3,msg->arg4);
+    MSGQ_LOGVB("MQ.put(%d,%p,%p,%p,%p)", msg->command, msg->arg1,msg->arg2,msg->arg3,msg->arg4);
 
     while( bytes  < sizeof(msg) )
     {
@@ -224,8 +219,6 @@ android::status_t MessageQueue::put(Message* msg)
         }
     }
 
-    MSGQ_LOGDA("MessageQueue::put EXIT");
-
     LOG_FUNCTION_NAME_EXIT;
     return 0;
 }
diff --git a/utils/MessageQueue.h b/utils/MessageQueue.h
index f35c248..ff2c9e3 100755
--- a/utils/MessageQueue.h
+++ b/utils/MessageQueue.h
@@ -26,25 +26,22 @@
 //#define DEBUG_LOG
 
 ///Camera HAL Logging Functions
-#ifndef DEBUG_LOG
+#ifndef MSGQ_DEBUG_LOG
 
+#define MSGQ_LOGVA(str)
+#define MSGQ_LOGVB(str, ...)
 #define MSGQ_LOGDA(str)
 #define MSGQ_LOGDB(str, ...)
 
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME
-#define LOG_FUNCTION_NAME_EXIT
-
 #else
 
-#define MSGQ_LOGDA DBGUTILS_LOGDA
-#define MSGQ_LOGDB DBGUTILS_LOGDB
+#define MSGQ_LOGDA CAMHAL_LOGDA
+#define MSGQ_LOGDB CAMHAL_LOGDB
 
 #endif
 
-#define MSGQ_LOGEA DBGUTILS_LOGEA
-#define MSGQ_LOGEB DBGUTILS_LOGEB
+#define MSGQ_LOGEA CAMHAL_LOGEA
+#define MSGQ_LOGEB CAMHAL_LOGEB
 
 
 namespace MSGUTILS {
diff --git a/vircam/AppCbNotifier.cpp b/vircam/AppCbNotifier.cpp
index 3c9728b..a9f0314 100755
--- a/vircam/AppCbNotifier.cpp
+++ b/vircam/AppCbNotifier.cpp
@@ -17,8 +17,7 @@
 
 
 
-#define LOG_TAG "AppCbNotif"
-
+#define LOG_TAG "CAMHAL_AppCbNotifier   "
 
 #include "VirtualCamHal.h"
 #include "VideoMetadata.h"
@@ -861,7 +860,7 @@ void AppCbNotifier::notifyFrame()
                            (CameraFrame::ENCODE_RAW_YUV420SP_TO_JPEG & frame->mQuirks)))
                 {
 
-                    LOGD("IMAGE_FRAME ENCODE_RAW.. %d", __LINE__);
+                    CAMHAL_LOGDA("IMAGE_FRAME ENCODE_RAW..\n");
                     int encode_quality = 100, tn_quality = 100;
                     int tn_width, tn_height;
                     unsigned int current_snapshot = 0;
@@ -959,7 +958,7 @@ void AppCbNotifier::notifyFrame()
                         }
                     }
 
-                    LOGD("IMAGE_FRAME ENCODE_RAW.. %d", __LINE__);
+                    CAMHAL_LOGDA("IMAGE_FRAME ENCODE_RAW..\n");
                     sp<Encoder_libjpeg> encoder = new Encoder_libjpeg(main_jpeg,
                                                       tn_jpeg,
                                                       AppCbNotifierEncoderCallback,
diff --git a/vircam/V4LCamAdpt.cpp b/vircam/V4LCamAdpt.cpp
index c818784..f7ff790 100755
--- a/vircam/V4LCamAdpt.cpp
+++ b/vircam/V4LCamAdpt.cpp
@@ -21,8 +21,7 @@
 *
 */
 
-#define LOG_NDEBUG 0
-#define LOG_TAG "V4LCamAdpt"
+#define LOG_TAG "V4LCamAdpt             "
 //reinclude because of a bug with the log macros
 #include <utils/Log.h>
 #include "DebugUtils.h"
@@ -52,13 +51,8 @@
 //for private_handle_t TODO move out of private header
 #include <gralloc_priv.h>
 
-#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false ))
 static int mDebugFps = 0;
 
-#define Q16_OFFSET 16
-
-#define HERE(Msg) {CAMHAL_LOGEB("--===line %d, %s===--\n", __LINE__, Msg);}
-
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
@@ -68,29 +62,9 @@ static int mDebugFps = 0;
 
 namespace android {
 
-#undef LOG_TAG
-///Maintain a separate tag for V4LCamAdpt logs to isolate issues
-#define LOG_TAG "V4LCamAdpt"
-
-//redefine because of a bug with the log macros
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME           LOGV("%d: %s() ENTER", __LINE__, __FUNCTION__);
-#define LOG_FUNCTION_NAME_EXIT      LOGV("%d: %s() EXIT", __LINE__, __FUNCTION__);
-
 //frames skipped before recalculating the framerate
 #define FPS_PERIOD 30
 
-#if 0
-#define V4L2_ROTATE_ID 0x980922  //V4L2_CID_ROTATE
-
-#define V4L2_CID_AUTO_FOCUS_STATUS              (V4L2_CID_CAMERA_CLASS_BASE+30)
-#define V4L2_AUTO_FOCUS_STATUS_IDLE             (0 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_BUSY             (1 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_REACHED          (1 << 1)
-#define V4L2_AUTO_FOCUS_STATUS_FAILED           (1 << 2)
-#endif
-
 /*--------------------junk STARTS here-----------------------------*/
 #define SYSFILE_CAMERA_SET_PARA "/sys/class/vm/attr2"
 #define SYSFILE_CAMERA_SET_MIRROR "/sys/class/vm/mirror"
@@ -98,19 +72,20 @@ static int writefile(char* path,char* content)
 {
     FILE* fp = fopen(path, "w+");
 
-    LOGD("Write file %s(%p) content %s", path, fp, content);
+    CAMHAL_LOGDB("Write file %s(%p) content %s", path, fp, content);
 
     if (fp) {
         while( ((*content) != '\0') ) {
-            if (EOF == fputc(*content,fp))
-                LOGD("write char fail");
+            if (EOF == fputc(*content,fp)){
+                CAMHAL_LOGDA("write char fail");
+            }
             content++;
         }
 
         fclose(fp);
     }
     else
-        LOGD("open file fail\n");
+        CAMHAL_LOGDA("open file fail\n");
     return 1;
 }
 /*--------------------Camera Adapter Class STARTS here-----------------------------*/
@@ -120,7 +95,6 @@ status_t V4LCamAdpt::initialize(CameraProperties::Properties* caps)
     LOG_FUNCTION_NAME;
 
     char value[PROPERTY_VALUE_MAX];
-    char fileflag[8];
     char const*filename = NULL;
     property_get("debug.camera.showfps", value, "0");
     mDebugFps = atoi(value);
@@ -137,7 +111,7 @@ status_t V4LCamAdpt::initialize(CameraProperties::Properties* caps)
 
     filename = caps->get(CameraProperties::DEVICE_NAME);
     if(filename == NULL){
-        CAMHAL_LOGEB("get index=%d 's name ", mSensorIndex);
+        CAMHAL_LOGEB("can't get index=%d's name ", mSensorIndex);
         return -EINVAL;
     }
     if ((mCameraHandle = open( filename, O_RDWR)) == -1)
@@ -170,7 +144,7 @@ status_t V4LCamAdpt::initialize(CameraProperties::Properties* caps)
         mbFrontCamera = true;
     else
         mbFrontCamera = false;
-    LOGD("mbFrontCamera=%d",mbFrontCamera);
+    CAMHAL_LOGDB("mbFrontCamera=%d",mbFrontCamera);
 
     // Initialize flags
     mPreviewing = false;
@@ -259,8 +233,9 @@ status_t V4LCamAdpt::IoctlStateProbe(void)
 	mIoctlSupport |= IOCTL_MASK_ROTATE;
     }
     
-    if(mIoctlSupport & IOCTL_MASK_ROTATE)
+    if(mIoctlSupport & IOCTL_MASK_ROTATE){
 	CAMHAL_LOGDB("camera %d support capture rotate",mSensorIndex);
+    }
     mRotateValue = 0;
 
     memset(&qc, 0, sizeof(struct v4l2_queryctrl));
@@ -621,7 +596,6 @@ status_t V4LCamAdpt::setBuffersFormat(int width, int height, int pixelformat)
     ret = ioctl(mCameraHandle, VIDIOC_S_FMT, &mVideoInfo->format);
     if (ret < 0) {
         CAMHAL_LOGEB("Open: VIDIOC_S_FMT Failed: %s", strerror(errno));
-        LOGD("ret=%d", ret);
         return ret;
     }
 
@@ -638,15 +612,14 @@ status_t V4LCamAdpt::getBuffersFormat(int &width, int &height, int &pixelformat)
     format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     ret = ioctl(mCameraHandle, VIDIOC_G_FMT, &format);
     if (ret < 0) {
-        CAMHAL_LOGEB("Open: VIDIOC_G_FMT Failed: %s", strerror(errno));
-        LOGD("ret=%d", ret);
+        CAMHAL_LOGDB("Open: VIDIOC_G_FMT Failed: %s", strerror(errno));
         return ret;
     }
     width = format.fmt.pix.width;
     height = format.fmt.pix.height;
     pixelformat = format.fmt.pix.pixelformat;
-    CAMHAL_LOGDB("Get BufferFormat Width * Height %d x %d format 0x%x",
-            width, height, pixelformat);	
+    CAMHAL_LOGDB("VIDIOC_G_FMT,W*H: %5d x %5d format 0x%x",
+                    width, height, pixelformat);
     return ret;
 }
 
@@ -723,7 +696,7 @@ status_t V4LCamAdpt::UseBuffersPreview(void* bufArr, int num)
         uint32_t *ptr = (uint32_t*) bufArr;
 
         //Associate each Camera internal buffer with the one from Overlay
-        LOGD("mPreviewBufs.add %#x, %d", ptr[i], i);
+        CAMHAL_LOGDB("mPreviewBufs.add %#x, %d", ptr[i], i);
         mPreviewBufs.add((int)ptr[i], i);
 
     }
@@ -750,16 +723,14 @@ status_t V4LCamAdpt::UseBuffersCapture(void* bufArr, int num)
 
     if (num != 1)
     {
-        LOGD("----------------- UseBuffersCapture num=%d", num);
+        CAMHAL_LOGDB("num=%d", num);
     }
 
     /* This will only be called right before taking a picture, so
      * stop preview now so that we can set buffer format here.
      */
-    LOGD("UseBuffersCapture stopPreview..");
     this->stopPreview();
 
-    LOGD("UseBuffersCapture setBuffersFormat..");
     int width, height;
     mParams.getPictureSize(&width, &height);
     mCaptureWidth = width;
@@ -818,7 +789,7 @@ status_t V4LCamAdpt::UseBuffersCapture(void* bufArr, int num)
         }
 
         uint32_t *ptr = (uint32_t*) bufArr;
-        LOGV("UseBuffersCapture %#x", ptr[0]);
+        CAMHAL_LOGDB("UseBuffersCapture %#x", ptr[0]);
         mCaptureBuf = (camera_memory_t*)ptr[0];
     }
 
@@ -863,8 +834,9 @@ int V4LCamAdpt::beginAutoFocusThread(void *cookie)
     	c->set_flash_mode( c->mCameraHandle, "off");
     }
     if(ret < 0) {
-	if( c->mIoctlSupport & IOCTL_MASK_FOCUS)
-		 CAMHAL_LOGEA("AUTO FOCUS Failed");
+	if( c->mIoctlSupport & IOCTL_MASK_FOCUS){
+		 CAMHAL_LOGDA("AUTO FOCUS Failed");
+        }
         c->notifyFocusSubscribers(false);
     } else {
         c->notifyFocusSubscribers(true);
@@ -911,7 +883,7 @@ status_t V4LCamAdpt::cancelAutoFocus()
         ctl.value = CAM_FOCUS_MODE_RELEASE;
         ret = ioctl(mCameraHandle, VIDIOC_S_CTRL, &ctl);
         if(ret < 0) {
-		CAMHAL_LOGEA("AUTO FOCUS Failed");
+		CAMHAL_LOGDA("AUTO FOCUS Failed");
         }
     }else if( CAM_FOCUS_MODE_AUTO == cur_focus_mode_for_conti){
     	if(CAM_FOCUS_MODE_INFINITY != cur_focus_mode){
@@ -1068,15 +1040,14 @@ status_t V4LCamAdpt::stopPreview()
 	cur_focus_mode_for_conti = CAM_FOCUS_MODE_RELEASE;
     }
 
-    LOGD("stopPreview unmap..");
     /* Unmap buffers */
     for (int i = 0; i < mPreviewBufferCount; i++){
-        if (munmap(mVideoInfo->mem[i], mVideoInfo->buf.length) < 0)
+        if (munmap(mVideoInfo->mem[i], mVideoInfo->buf.length) < 0){
             CAMHAL_LOGEA("Unmap failed");
+        }
 	
     }
 
-    LOGD("stopPreview clearexit..");
     mPreviewBufs.clear();
     mPreviewIdxs.clear();
     return ret;
@@ -1161,7 +1132,7 @@ static void debugShowFPS()
         mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
         mLastFpsTime = now;
         mLastFrameCount = mFrameCount;
-        LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps);
+        CAMHAL_LOGDB("Camera %d Frames, %f FPS", mFrameCount, mFps);
     }
     // XXX: mFPS has the value we want
 }
@@ -1359,9 +1330,9 @@ int V4LCamAdpt::previewThread()
         frame.mTimestamp = systemTime(SYSTEM_TIME_MONOTONIC);
         frame.mPixelFmt = mPixelFormat;
         ret = setInitFrameRefCount(frame.mBuffer, frame.mFrameMask);
-        if (ret)
-            LOGE("setInitFrameRefCount err=%d", ret);
-        else
+        if (ret){
+            CAMHAL_LOGEB("setInitFrameRefCount err=%d", ret);
+        }else
             ret = sendFrameToSubscribers(&frame);
         //LOGD("previewThread /sendFrameToSubscribers ret=%d", ret);           
     }
@@ -1389,7 +1360,7 @@ int V4LCamAdpt::GenExif(ExifElementsTable* exiftable)
     //Image orientation
     int orientation = mParams.getInt(CameraParameters::KEY_ROTATION);
     //covert 0 90 180 270 to 0 1 2 3
-    LOGE("get orientaion %d",orientation);
+    CAMHAL_LOGDB("get orientaion %d",orientation);
     if(orientation == 0)
         orientation = 1;
     else if(orientation == 90)
@@ -1419,7 +1390,6 @@ int V4LCamAdpt::GenExif(ExifElementsTable* exiftable)
     }
 
     sprintf(exifcontent,"%d",orientation);
-    //LOGD("exifcontent %s",exifcontent);
     exiftable->insertElement("Orientation",(const char*)exifcontent);
     
     sprintf(exifcontent,"%d",width);
@@ -1636,10 +1606,10 @@ int V4LCamAdpt::pictureThread()
             height = temp;
         }
         
-        LOGD("pictureThread mCaptureBuf=%#x dest=%#x fp=%#x width=%d height=%d",
-                (uint32_t)mCaptureBuf, (uint32_t)dest, (uint32_t)fp, width, height);
-        LOGD("length=%d bytesused=%d index=%d",
-                mVideoInfo->buf.length, mVideoInfo->buf.bytesused, index);
+        CAMHAL_LOGDB("mCaptureBuf=%p,dest=%p,fp=%p,index=%d\n"
+                     "w=%d h=%d,len=%d,bytesused=%d\n",
+                     mCaptureBuf, dest, fp,index, width, height,
+                     mVideoInfo->buf.length, mVideoInfo->buf.bytesused);
 
         if(DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT == V4L2_PIX_FMT_RGB24){ // rgb24
 
@@ -1713,8 +1683,9 @@ int V4LCamAdpt::pictureThread()
         nDequeued = 0;
 
         /* Unmap buffers */
-        if (munmap(mVideoInfo->mem[0], mVideoInfo->buf.length) < 0)
+        if (munmap(mVideoInfo->mem[0], mVideoInfo->buf.length) < 0){
             CAMHAL_LOGEA("Unmap failed");
+        }
 
 
     }
@@ -1736,17 +1707,18 @@ int V4LCamAdpt::pictureThread()
     startPreview();
 
     ret = setInitFrameRefCount(frame.mBuffer, frame.mFrameMask);
-    if (ret)
-        LOGE("setInitFrameRefCount err=%d", ret);
-    else
+    if (ret){
+        CAMHAL_LOGEB("setInitFrameRefCount err=%d", ret);
+    }else{
         ret = sendFrameToSubscribers(&frame);
+    }
 
     return ret;
 }
 
 
 status_t V4LCamAdpt::disableMirror(bool bDisable) {
-    LOGD("disableMirror %d",bDisable);
+    CAMHAL_LOGDB("disableMirror %d",bDisable);
     mbDisableMirror = bDisable;
     setMirrorEffect();
     return NO_ERROR;
@@ -1755,7 +1727,7 @@ status_t V4LCamAdpt::disableMirror(bool bDisable) {
 status_t V4LCamAdpt::setMirrorEffect() {
 
     bool bEnable = mbFrontCamera&&(!mbDisableMirror);
-    LOGD("setmirror effect %d",bEnable);
+    CAMHAL_LOGDB("setmirror effect %d",bEnable);
     
     if(mIoctlSupport & IOCTL_MASK_HFLIP){
         if(set_hflip_mode(mCameraHandle,bEnable))
@@ -1979,12 +1951,6 @@ bool V4LCamAdpt::getCameraAutoFocus( char* focus_mode_str, char*def_focus_mode)
     int menu_num = 0;
     int mode_count = 0;
 
-    if((!focus_mode_str)||(!def_focus_mode)){
-        CAMHAL_LOGEA("focus mode str buf error");
-        return auto_focus_enable;
-    }
-
-
     memset(&qc, 0, sizeof(struct v4l2_queryctrl));
     qc.id = V4L2_CID_FOCUS_AUTO;
     menu_num = ioctl (mCameraHandle, VIDIOC_QUERYCTRL, &qc);
@@ -2134,7 +2100,7 @@ extern "C" void newloadCaps(int camera_id, CameraProperties::Properties* params)
 #endif
     
     bFrontCam = v.isFrontCam( camera_id ); 
-	CAMHAL_LOGDB("%s\n", bFrontCam?"front cam":"back cam");
+    CAMHAL_LOGVB("%s\n", bFrontCam?"front cam":"back cam");
     //should changed while the screen orientation changed.
     int degree = -1;
     char property[64];
@@ -2200,8 +2166,9 @@ extern "C" void newloadCaps(int camera_id, CameraProperties::Properties* params)
 	    sprintf(fpsrange,"%s%d","5000,",fps*1000/fps_num);
 	    params->set(CameraProperties::FRAMERATE_RANGE, fpsrange);
     }else{
-	    if(NO_ERROR != ret)
-		    CAMHAL_LOGDA("sensor driver need to implement VIDIOC_G_PARM!!!\n");
+	    if(NO_ERROR != ret){
+		    CAMHAL_LOGDA("sensor driver need to implement enum framerate!!!\n");
+            }
 	    params->set(CameraProperties::SUPPORTED_PREVIEW_FRAME_RATES, "10,15");
 	    params->set(CameraProperties::PREVIEW_FRAME_RATE, "15");
 
@@ -2223,7 +2190,7 @@ extern "C" void newloadCaps(int camera_id, CameraProperties::Properties* params)
 	//get preview size & set
     char *sizes = (char *) calloc (1, 1024);
     if(!sizes){
-        CAMHAL_LOGEA("Alloc string buff error!");
+        CAMHAL_LOGDA("Alloc string buff error!");
         return;
     }        
     
@@ -2539,6 +2506,7 @@ int V4LCamAdpt::enumFramerate ( int *fps, int *fps_num)
 		V4L2_PIX_FMT_YVU420,
 	};
 	struct v4l2_frmsize_discrete resolution_tbl[]={
+		{1280,720},
 		{640, 480},
 		{320, 240},
 	};
@@ -2639,8 +2607,9 @@ int V4LCamAdpt::set_white_balance(int camera_fd,const char *swb)
 	mWhiteBalance = ctl.value;
     }
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set white balance fail: %s. ret=%d", strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set white balance fail: %s. ret=%d", strerror(errno),ret);
+    }
     return ret ;
 }
 
@@ -2708,9 +2677,9 @@ extern "C" int V4LCamAdpt::SetExposure(int camera_fd,const char *sbn)
     ctl.value = level + (mEVmax - mEVmin)/2;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set Exposure fail: %s. ret=%d",
-              strerror(errno),ret);
+    if(ret<0){
+        CAMHAL_LOGDB("Set Exposure fail: %s. ret=%d", strerror(errno),ret);
+    }
 
     return ret ;
 }
@@ -2732,9 +2701,11 @@ int V4LCamAdpt::set_effect(int camera_fd,const char *sef)
     else if(strcasecmp(sef,"sepia")==0)
         ctl.value=CAM_EFFECT_ENC_SEPIA;
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set effect fail: %s. ret=%d", strerror(errno),ret);
-     return ret ;
+    if(ret<0){
+        CAMHAL_LOGDB("Set effect fail: %s. ret=%d", strerror(errno),ret);
+    }
+
+    return ret;
 }
 
 int V4LCamAdpt::set_night_mode(int camera_fd,const char *snm)
@@ -2753,10 +2724,11 @@ int V4LCamAdpt::set_night_mode(int camera_fd,const char *snm)
     ctl.id = V4L2_CID_DO_WHITE_BALANCE;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
-        CAMHAL_LOGEB("AMLOGIC CAMERA Set night mode fail: %s. ret=%d",
-                                                    strerror(errno),ret);
-     return ret ;
+    if(ret<0){
+        CAMHAL_LOGDB("Set night mode fail: %s. ret=%d", strerror(errno),ret);
+    }
+
+    return ret;
 }
 
 extern "C" int V4LCamAdpt::set_banding(int camera_fd,const char *snm)
@@ -2764,9 +2736,6 @@ extern "C" int V4LCamAdpt::set_banding(int camera_fd,const char *snm)
     int ret = 0;
     struct v4l2_control ctl;
 
-    if(camera_fd<0)
-        return -1;
-
     memset( &ctl, 0, sizeof(ctl));
     if(strcasecmp(snm,"50hz")==0)
         ctl.value= CAM_ANTIBANDING_50HZ;
@@ -2786,7 +2755,7 @@ extern "C" int V4LCamAdpt::set_banding(int camera_fd,const char *snm)
     }
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
     if(ret<0){
-       	CAMHAL_LOGEB("AMLOGIC CAMERA Set banding fail: %s. ret=%d",
+       	CAMHAL_LOGDB("Set banding fail: %s. ret=%d",
                                 strerror(errno),ret);
     }
     return ret ;
@@ -2801,17 +2770,14 @@ bool V4LCamAdpt::get_flash_mode(char *flash_status,
     int ret = NO_ERROR;
     int status_count = 0;
 
-    if((!flash_status)||(!def_flash_status)){
-        CAMHAL_LOGEA("flash status str buf error\n");
-        return flash_enable;
-    }
-
     memset(&qc, 0, sizeof(qc));
     qc.id = V4L2_CID_BACKLIGHT_COMPENSATION;
     ret = ioctl (mCameraHandle, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( ret < 0) || (qc.type != V4L2_CTRL_TYPE_MENU)){
         flash_enable = false;
-        CAMHAL_LOGDB("camera handle %d can't support flash\n",mCameraHandle);
+        CAMHAL_LOGDB("can't support flash, %s, ret=%d, %s\n",
+                (qc.flags == V4L2_CTRL_FLAG_DISABLED)? "disable":"",
+                ret,  qc.type != V4L2_CTRL_TYPE_MENU?"":"type not right");
     }else {
         memset(&qm, 0, sizeof(qm));
         qm.id = V4L2_CID_BACKLIGHT_COMPENSATION;
@@ -2882,7 +2848,9 @@ int V4LCamAdpt::get_hflip_mode(int camera_fd)
     ret = ioctl (camera_fd, VIDIOC_QUERYCTRL, &qc);
     if((qc.flags == V4L2_CTRL_FLAG_DISABLED) ||( ret < 0) || (qc.type != V4L2_CTRL_TYPE_INTEGER)){
         ret = -1;
-        CAMHAL_LOGDB("camera handle %d can't support HFlip!\n",camera_fd);
+        CAMHAL_LOGDB("can't support HFlip! %s ret=%d %s\n",
+            (qc.flags == V4L2_CTRL_FLAG_DISABLED)?"disable":"",
+            ret, (qc.type != V4L2_CTRL_TYPE_INTEGER)?"":"type not right");
     }else{
         CAMHAL_LOGDB("camera handle %d supports HFlip!\n",camera_fd);
     }
@@ -2903,8 +2871,9 @@ int V4LCamAdpt::set_hflip_mode(int camera_fd, bool mode)
     ctl.id = V4L2_CID_HFLIP;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
+    if(ret<0){
         CAMHAL_LOGEB("Set hflip mode fail: %s. ret=%d", strerror(errno),ret);
+    }
     return ret ;
 }
 
@@ -2945,9 +2914,11 @@ int V4LCamAdpt::set_zoom_level(int camera_fd, int zoom)
     ctl.value=zoom;
     ctl.id = V4L2_CID_ZOOM_ABSOLUTE;
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
+    if(ret<0){
         CAMHAL_LOGEB("Set zoom level fail: %s. ret=%d", strerror(errno),ret);
-     return ret ;
+    }
+
+    return ret ;
 }
 
 int V4LCamAdpt::set_rotate_value(int camera_fd, int value)
@@ -2969,8 +2940,10 @@ int V4LCamAdpt::set_rotate_value(int camera_fd, int value)
     ctl.id = V4L2_ROTATE_ID;
 
     ret = ioctl(camera_fd, VIDIOC_S_CTRL, &ctl);
-    if(ret<0)
+    if(ret<0){
         CAMHAL_LOGEB("Set rotate value fail: %s. ret=%d", strerror(errno),ret);
+    }
+
     return ret ;
 }
 
diff --git a/vircam/VirtualCamHal.cpp b/vircam/VirtualCamHal.cpp
index 5ed52c6..12d267f 100755
--- a/vircam/VirtualCamHal.cpp
+++ b/vircam/VirtualCamHal.cpp
@@ -22,7 +22,7 @@
 */
 
 #define LOG_NDEBUG 0
-#define LOG_TAG "VirtCamHAL"
+#define LOG_TAG "CAMHAL_VirtCamHAL      "
 
 #include "VirtualCamHal.h"
 #include "ANativeWindowDisplayAdapter.h"
@@ -1000,18 +1000,19 @@ int VirtualCamHal::setParameters(const CameraParameters& params)
             mParameters.set(CameraParameters::KEY_METERING_AREAS, valstr);
             }
 
-LOGD("setParameters, 1 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+        CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
         CameraParameters adapterParams = mParameters;
 
         // Only send parameters to adapter if preview is already
         // enabled or doesSetParameterNeedUpdate says so. Initial setParameters to camera adapter,
         // will be called in startPreview()
         // TODO(XXX): Need to identify other parameters that need update from camera adapter
-LOGD("setParameters mCameraAdapter=%#x mPreviewEnabled=%d updateRequired=%d", (uint32_t)mCameraAdapter, (uint32_t)mPreviewEnabled, (uint32_t)updateRequired);
+        CAMHAL_LOGDB("mCameraAdapter=%p,mPreviewEnabled=%d,updateRequired=%d",
+                        mCameraAdapter, mPreviewEnabled, updateRequired);
         if ( (NULL != mCameraAdapter) && (mPreviewEnabled || updateRequired) ) {
             ret |= mCameraAdapter->setParameters(adapterParams);
         }
-LOGD("setParameters, 2 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+        CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
 
         if( NULL != params.get(ExCameraParameters::KEY_TEMP_BRACKETING_RANGE_POS) )
             {
@@ -1114,7 +1115,7 @@ LOGD("setParameters, 2 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraP
         return ret;
         }
 
-LOGD("setParameters, 3 mParameters KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
+    CAMHAL_LOGDB("KEY_PICTURE_SIZE=%s", mParameters.get(CameraParameters::KEY_PICTURE_SIZE));
     LOG_FUNCTION_NAME_EXIT;
 
     return ret;
@@ -1144,7 +1145,7 @@ status_t VirtualCamHal::allocPreviewBufs(int width, int height, const char* prev
                                                                     mPreviewLength,
                                                                     buffercount);
         
-        LOGD("allocPreviewBufs buffercount=%d", buffercount);
+        CAMHAL_LOGDB("buffercount=%d", buffercount);
 
         if (NULL == mPreviewBufs ) {
             CAMHAL_LOGEA("Couldn't allocate preview buffers");
@@ -1192,7 +1193,7 @@ status_t VirtualCamHal::allocPreviewBufs(int width, int height, const char* prev
         //buf_size = ((buf_size+4095)/4096)*4096;
         mPreviewBufs = (int32_t *)mMemoryManager->allocateBuffer(0, 0, NULL, buf_size, buffercount);
 		        
-        LOGD("allocPreviewBufs buffercount=%d", buffercount);
+        CAMHAL_LOGDB("buffercount=%d", buffercount);
 
         if (NULL == mPreviewBufs ) {
             CAMHAL_LOGEA("Couldn't allocate preview buffers");
diff --git a/vircam/inc/VirtualCamHal.h b/vircam/inc/VirtualCamHal.h
index 03d9baa..6ad2895 100755
--- a/vircam/inc/VirtualCamHal.h
+++ b/vircam/inc/VirtualCamHal.h
@@ -58,43 +58,6 @@
 //disable it now
 //#define ENABLE_SENSOR_LISTENER 1 
 
-//Uncomment to enable more verbose/debug logs
-#define DEBUG_LOG
-
-#define LOGE ALOGE
-#define LOGV ALOGV
-#define LOGI ALOGI
-#define LOGD ALOGD
-
-///Camera HAL Logging Functions
-#ifndef DEBUG_LOG
-
-#define CAMHAL_LOGDA(str)
-#define CAMHAL_LOGDB(str, ...)
-#define CAMHAL_LOGVA(str)
-#define CAMHAL_LOGVB(str, ...)
-
-#define CAMHAL_LOGEA LOGE
-#define CAMHAL_LOGEB LOGE
-
-#undef LOG_FUNCTION_NAME
-#undef LOG_FUNCTION_NAME_EXIT
-#define LOG_FUNCTION_NAME
-#define LOG_FUNCTION_NAME_EXIT
-
-#else
-
-#define CAMHAL_LOGDA DBGUTILS_LOGDA
-#define CAMHAL_LOGDB DBGUTILS_LOGDB
-#define CAMHAL_LOGVA DBGUTILS_LOGVA
-#define CAMHAL_LOGVB DBGUTILS_LOGVB
-
-#define CAMHAL_LOGEA DBGUTILS_LOGEA
-#define CAMHAL_LOGEB DBGUTILS_LOGEB
-
-#endif
-
-
 //#define AMLOGIC_CAMERA_OVERLAY_SUPPORT
 //#define AMLOGIC_USB_CAMERA_SUPPORT