summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraHal_Module.cpp46
-rw-r--r--camera/CameraProperties.cpp2
-rw-r--r--camera/NV12_resize.c22
-rwxr-xr-xcamera/OMXCameraAdapter/OMXCameraAdapter.cpp2
4 files changed, 36 insertions, 36 deletions
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index 5fe0c06..2acb1e0 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -78,7 +78,7 @@ int camera_set_preview_window(struct camera_device * device,
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -99,7 +99,7 @@ void camera_set_callbacks(struct camera_device * device,
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -113,7 +113,7 @@ void camera_enable_msg_type(struct camera_device * device, int32_t msg_type)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -127,7 +127,7 @@ void camera_disable_msg_type(struct camera_device * device, int32_t msg_type)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -141,7 +141,7 @@ int camera_msg_type_enabled(struct camera_device * device, int32_t msg_type)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return 0;
@@ -156,7 +156,7 @@ int camera_start_preview(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -172,7 +172,7 @@ void camera_stop_preview(struct camera_device * device)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -187,7 +187,7 @@ int camera_preview_enabled(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -203,7 +203,7 @@ int camera_store_meta_data_in_buffers(struct camera_device * device, int enable)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -221,7 +221,7 @@ int camera_start_recording(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -236,7 +236,7 @@ void camera_stop_recording(struct camera_device * device)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -251,7 +251,7 @@ int camera_recording_enabled(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -267,7 +267,7 @@ void camera_release_recording_frame(struct camera_device * device,
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -282,7 +282,7 @@ int camera_auto_focus(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -298,7 +298,7 @@ int camera_cancel_auto_focus(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -314,7 +314,7 @@ int camera_take_picture(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -330,7 +330,7 @@ int camera_cancel_picture(struct camera_device * device)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -346,7 +346,7 @@ int camera_set_parameters(struct camera_device * device, const char *params)
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -362,7 +362,7 @@ char* camera_get_parameters(struct camera_device * device)
char* param = NULL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return NULL;
@@ -378,7 +378,7 @@ static void camera_put_parameters(struct camera_device *device, char *parms)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -394,7 +394,7 @@ int camera_send_command(struct camera_device * device,
int rv = -EINVAL;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return rv;
@@ -409,7 +409,7 @@ void camera_release(struct camera_device * device)
{
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
if(!device)
return;
@@ -440,7 +440,7 @@ int camera_device_close(hw_device_t* device)
int ret = 0;
ti_camera_device_t* ti_dev = NULL;
- LOGV("%s", __FUNCTION__);
+ ALOGV("%s", __FUNCTION__);
android::Mutex::Autolock lock(gCameraHalDeviceLock);
diff --git a/camera/CameraProperties.cpp b/camera/CameraProperties.cpp
index 0e83fc9..9d2b632 100644
--- a/camera/CameraProperties.cpp
+++ b/camera/CameraProperties.cpp
@@ -114,7 +114,7 @@ status_t CameraProperties::loadProperties()
}
}
- LOGV("mCamerasSupported = %d", mCamerasSupported);
+ ALOGV("mCamerasSupported = %d", mCamerasSupported);
LOG_FUNCTION_NAME_EXIT;
return ret;
}
diff --git a/camera/NV12_resize.c b/camera/NV12_resize.c
index 03c049e..63f8212 100644
--- a/camera/NV12_resize.c
+++ b/camera/NV12_resize.c
@@ -31,7 +31,7 @@ VT_resizeFrame_Video_opt2_lp
mmUint16 dummy /* Transparent pixel value */
)
{
- LOGV("VT_resizeFrame_Video_opt2_lp+");
+ ALOGV("VT_resizeFrame_Video_opt2_lp+");
mmUint16 row,col;
mmUint32 resizeFactorX;
@@ -55,11 +55,11 @@ 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 );
+ ALOGV("************************f(i_img_ptr->uHeight == o_img_ptr->uHeight) are same *********************\n");
+ ALOGV("************************(i_img_ptr->width == %d" , i_img_ptr->uWidth );
+ ALOGV("************************(i_img_ptr->uHeight == %d" , i_img_ptr->uHeight );
+ ALOGV("************************(o_img_ptr->width == %d" ,o_img_ptr->uWidth );
+ ALOGV("************************(o_img_ptr->uHeight == %d" , o_img_ptr->uHeight );
}
}
@@ -67,7 +67,7 @@ VT_resizeFrame_Video_opt2_lp
!o_img_ptr || !o_img_ptr->imgPtr)
{
LOGE("Image Point NULL");
- LOGV("VT_resizeFrame_Video_opt2_lp-");
+ ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
@@ -96,7 +96,7 @@ VT_resizeFrame_Video_opt2_lp
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-");
+ ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
@@ -298,10 +298,10 @@ VT_resizeFrame_Video_opt2_lp
else
{
LOGE("eFormat not supported");
- LOGV("VT_resizeFrame_Video_opt2_lp-");
+ ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
- LOGV("success");
- LOGV("VT_resizeFrame_Video_opt2_lp-");
+ ALOGV("success");
+ ALOGV("VT_resizeFrame_Video_opt2_lp-");
return TRUE;
}
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index 8389bf0..2cec0c3 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -2985,7 +2985,7 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE
mFramesWithEncoder++;
}
- //LOGV("FBD pBuffer = 0x%x", pBuffHeader->pBuffer);
+ //ALOGV("FBD pBuffer = 0x%x", pBuffHeader->pBuffer);
if( mWaitingForSnapshot )
{