summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
Diffstat (limited to 'camera')
-rw-r--r--camera/ANativeWindowDisplayAdapter.cpp12
-rw-r--r--camera/BaseCameraAdapter.cpp4
-rw-r--r--camera/CameraHal_Module.cpp16
-rw-r--r--camera/CameraProperties.cpp6
-rw-r--r--camera/MemoryManager.cpp2
-rw-r--r--camera/NV12_resize.c6
-rwxr-xr-xcamera/OMXCameraAdapter/OMXCameraAdapter.cpp6
-rw-r--r--camera/OMXCameraAdapter/OMXExif.cpp2
-rw-r--r--camera/inc/CameraHal.h4
9 files changed, 29 insertions, 29 deletions
diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp
index e6a4c87..e4a70ae 100644
--- a/camera/ANativeWindowDisplayAdapter.cpp
+++ b/camera/ANativeWindowDisplayAdapter.cpp
@@ -540,7 +540,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);
+ ALOGE("native_window_set_usage failed: %s (%d)", strerror(-err), -err);
if ( ENODEV == err ) {
CAMHAL_LOGEA("Preview surface abandoned!");
@@ -554,7 +554,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);
+ ALOGE("native_window_set_buffer_count failed: %s (%d)", strerror(-err), -err);
if ( ENODEV == err ) {
CAMHAL_LOGEA("Preview surface abandoned!");
@@ -575,7 +575,7 @@ void* ANativeWindowDisplayAdapter::allocateBuffer(int width, int height, const c
/*toOMXPixFormat(format)*/HAL_PIXEL_FORMAT_TI_NV12); // Gralloc only supports NV12 alloc!
if (err != 0) {
- LOGE("native_window_set_buffers_geometry failed: %s (%d)", strerror(-err), -err);
+ ALOGE("native_window_set_buffers_geometry failed: %s (%d)", strerror(-err), -err);
if ( ENODEV == err ) {
CAMHAL_LOGEA("Preview surface abandoned!");
@@ -830,7 +830,7 @@ status_t ANativeWindowDisplayAdapter::returnBuffersToWindow()
}
}
else
- LOGE("mANativeWindow is NULL");
+ ALOGE("mANativeWindow is NULL");
///Clear the frames with camera adapter map
mFramesWithCameraAdapterMap.clear();
@@ -1099,7 +1099,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);
+ ALOGE("Surface::queueBuffer returned error %d", ret);
}
mFramesWithCameraAdapterMap.removeItem((int) dispFrame.mBuffer);
@@ -1141,7 +1141,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);
+ ALOGE("Surface::queueBuffer returned error %d", ret);
}
mFramesWithCameraAdapterMap.removeItem((int) dispFrame.mBuffer);
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp
index 882e4df..5f86166 100644
--- a/camera/BaseCameraAdapter.cpp
+++ b/camera/BaseCameraAdapter.cpp
@@ -314,8 +314,8 @@ void BaseCameraAdapter::returnFrame(void* frameBuf, CameraFrame::FrameType frame
#ifdef DEBUG_LOG
if(mBuffersWithDucati.indexOfKey((int)frameBuf)>=0)
{
- LOGE("Buffer already with Ducati!! 0x%x", frameBuf);
- for(int i=0;i<mBuffersWithDucati.size();i++) LOGE("0x%x", mBuffersWithDucati.keyAt(i));
+ ALOGE("Buffer already with Ducati!! 0x%x", frameBuf);
+ for(int i=0;i<mBuffersWithDucati.size();i++) ALOGE("0x%x", mBuffersWithDucati.keyAt(i));
}
mBuffersWithDucati.add((int)frameBuf,1);
#endif
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index daff31e..cb4e804 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -501,7 +501,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, "
+ ALOGE("camera service provided cameraid out of bounds, "
"cameraid = %d, num supported = %d",
cameraid, num_cameras);
rv = -EINVAL;
@@ -510,7 +510,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
if(gCamerasOpen >= MAX_SIMUL_CAMERAS_SUPPORTED)
{
- LOGE("maximum number of cameras already open");
+ ALOGE("maximum number of cameras already open");
rv = -ENOMEM;
goto fail;
}
@@ -518,7 +518,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
camera_device = (ti_camera_device_t*)malloc(sizeof(*camera_device));
if(!camera_device)
{
- LOGE("camera_device allocation fail");
+ ALOGE("camera_device allocation fail");
rv = -ENOMEM;
goto fail;
}
@@ -526,7 +526,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");
+ ALOGE("camera_ops allocation fail");
rv = -ENOMEM;
goto fail;
}
@@ -572,7 +572,7 @@ int camera_device_open(const hw_module_t* module, const char* name,
if(gCameraProperties.getProperties(cameraid, &properties) < 0)
{
- LOGE("Couldn't get camera properties");
+ ALOGE("Couldn't get camera properties");
rv = -ENOMEM;
goto fail;
}
@@ -581,14 +581,14 @@ int camera_device_open(const hw_module_t* module, const char* name,
if(!camera)
{
- LOGE("Couldn't create instance of CameraHal class");
+ ALOGE("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");
+ ALOGE("Couldn't initialize camera instance");
rv = -ENODEV;
goto fail;
}
@@ -656,7 +656,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");
+ ALOGE("Couldn't get camera properties");
rv = -EINVAL;
goto end;
}
diff --git a/camera/CameraProperties.cpp b/camera/CameraProperties.cpp
index 9d2b632..5d3ff20 100644
--- a/camera/CameraProperties.cpp
+++ b/camera/CameraProperties.cpp
@@ -100,13 +100,13 @@ status_t CameraProperties::loadProperties()
mCamerasSupported = CameraAdapter_Capabilities(mCameraProps, mCamerasSupported, MAX_CAMERAS_SUPPORTED);
if((int)mCamerasSupported < 0) {
- LOGE("error while getting capabilities");
+ ALOGE("error while getting capabilities");
ret = UNKNOWN_ERROR;
} else if (mCamerasSupported > MAX_CAMERAS_SUPPORTED) {
- LOGE("returned too many adapaters");
+ ALOGE("returned too many adapaters");
ret = UNKNOWN_ERROR;
} else {
- LOGE("num_cameras = %d", mCamerasSupported);
+ ALOGE("num_cameras = %d", mCamerasSupported);
for (unsigned int i = 0; i < mCamerasSupported; i++) {
mCameraProps[i].set(CAMERA_SENSOR_INDEX, i);
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp
index 1333666..8631bbd 100644
--- a/camera/MemoryManager.cpp
+++ b/camera/MemoryManager.cpp
@@ -113,7 +113,7 @@ void* MemoryManager::allocateBuffer(int width, int height, const char* format, i
return (void*)bufsArr;
error:
- LOGE("Freeing buffers already allocated after error occurred");
+ ALOGE("Freeing buffers already allocated after error occurred");
if(bufsArr)
freeBuffer(bufsArr);
diff --git a/camera/NV12_resize.c b/camera/NV12_resize.c
index 63f8212..7f92fb2 100644
--- a/camera/NV12_resize.c
+++ b/camera/NV12_resize.c
@@ -66,7 +66,7 @@ VT_resizeFrame_Video_opt2_lp
if (!i_img_ptr || !i_img_ptr->imgPtr ||
!o_img_ptr || !o_img_ptr->imgPtr)
{
- LOGE("Image Point NULL");
+ ALOGE("Image Point NULL");
ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
@@ -95,7 +95,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);
+ ALOGE("idx or idy less then 1 idx = %d idy = %d stride = %d", idx, idy, i_img_ptr->uStride);
ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
@@ -297,7 +297,7 @@ VT_resizeFrame_Video_opt2_lp
}
else
{
- LOGE("eFormat not supported");
+ ALOGE("eFormat not supported");
ALOGV("VT_resizeFrame_Video_opt2_lp-");
return FALSE;
}
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index d6ffa57..e6c733d 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -590,7 +590,7 @@ void saveFile(unsigned char *buff, int width, int height, int format) {
sprintf(fn, "/preview%03d.yuv", counter);
fd = open(fn, O_CREAT | O_WRONLY | O_SYNC | O_TRUNC, 0777);
if(fd < 0) {
- LOGE("Unable to open file %s: %s", fn, strerror(fd));
+ ALOGE("Unable to open file %s: %s", fn, strerror(fd));
return;
}
@@ -3008,8 +3008,8 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE
#ifdef DEBUG_LOG
if(mBuffersWithDucati.indexOfKey((int)pBuffHeader->pBuffer)<0)
{
- LOGE("Buffer was never with Ducati!! 0x%x", pBuffHeader->pBuffer);
- for(int i=0;i<mBuffersWithDucati.size();i++) LOGE("0x%x", mBuffersWithDucati.keyAt(i));
+ ALOGE("Buffer was never with Ducati!! 0x%x", pBuffHeader->pBuffer);
+ for(int i=0;i<mBuffersWithDucati.size();i++) ALOGE("0x%x", mBuffersWithDucati.keyAt(i));
}
mBuffersWithDucati.removeItem((int)pBuffHeader->pBuffer);
#endif
diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp
index c244c40..70fb3db 100644
--- a/camera/OMXCameraAdapter/OMXExif.cpp
+++ b/camera/OMXCameraAdapter/OMXExif.cpp
@@ -799,7 +799,7 @@ status_t OMXCameraAdapter::convertGPSCoord(double coord,
if ( coord == 0 ) {
- LOGE("Invalid GPS coordinate");
+ ALOGE("Invalid GPS coordinate");
return -EINVAL;
}
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index 66f2c6d..e7ea9c8 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -90,8 +90,8 @@
#define CAMHAL_LOGVA(str)
#define CAMHAL_LOGVB(str, ...)
-#define CAMHAL_LOGEA LOGE
-#define CAMHAL_LOGEB LOGE
+#define CAMHAL_LOGEA ALOGE
+#define CAMHAL_LOGEB ALOGE
#undef LOG_FUNCTION_NAME
#undef LOG_FUNCTION_NAME_EXIT