diff options
| -rw-r--r-- | camera/ANativeWindowDisplayAdapter.cpp | 12 | ||||
| -rw-r--r-- | camera/BaseCameraAdapter.cpp | 4 | ||||
| -rw-r--r-- | camera/CameraHal_Module.cpp | 16 | ||||
| -rw-r--r-- | camera/CameraProperties.cpp | 6 | ||||
| -rw-r--r-- | camera/MemoryManager.cpp | 2 | ||||
| -rw-r--r-- | camera/NV12_resize.c | 6 | ||||
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 6 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXExif.cpp | 2 | ||||
| -rw-r--r-- | camera/inc/CameraHal.h | 4 | ||||
| -rw-r--r-- | hwc/hwc.c | 52 | ||||
| -rw-r--r-- | ion/ion.c | 10 | ||||
| -rw-r--r-- | libstagefrighthw/TIOMXPlugin.cpp | 4 | ||||
| -rw-r--r-- | libtiutils/DebugUtils.h | 4 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 12 |
14 files changed, 70 insertions, 70 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 @@ -1101,7 +1101,7 @@ static int clone_layer(omap4_hwc_device_t *hwc_dev, int ix) { struct dss2_ovl_info *o = &dsscomp->ovls[dsscomp->num_ovls]; if (dsscomp->num_ovls >= MAX_HW_OVERLAYS) { - LOGE("**** cannot clone layer #%d. using all %d overlays.", ix, dsscomp->num_ovls); + ALOGE("**** cannot clone layer #%d. using all %d overlays.", ix, dsscomp->num_ovls); return -EBUSY; } @@ -1294,7 +1294,7 @@ static int omap4_hwc_prepare(struct hwc_composer_device *dev, hwc_layer_list_t* /* assign a z-layer for fb */ if (fb_z < 0) { if (num.composited_layers) - LOGE("**** should have assigned z-layer for fb"); + ALOGE("**** should have assigned z-layer for fb"); fb_z = z++; } @@ -1346,16 +1346,16 @@ static int omap4_hwc_prepare(struct hwc_composer_device *dev, hwc_layer_list_t* ext->last = ext->current; if (z != dsscomp->num_ovls || dsscomp->num_ovls > MAX_HW_OVERLAYS) - LOGE("**** used %d z-layers for %d overlays\n", z, dsscomp->num_ovls); + ALOGE("**** used %d z-layers for %d overlays\n", z, dsscomp->num_ovls); /* verify all z-orders and overlay indices are distinct */ for (i = z = ix = 0; i < dsscomp->num_ovls; i++) { struct dss2_ovl_cfg *c = &dsscomp->ovls[i].cfg; if (z & (1 << c->zorder)) - LOGE("**** used z-order #%d multiple times", c->zorder); + ALOGE("**** used z-order #%d multiple times", c->zorder); if (ix & (1 << c->ix)) - LOGE("**** used ovl index #%d multiple times", c->ix); + ALOGE("**** used ovl index #%d multiple times", c->ix); z |= 1 << c->zorder; ix |= 1 << c->ix; } @@ -1442,7 +1442,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy, if (hwc_dev->use_sgx) { if (!eglSwapBuffers((EGLDisplay)dpy, (EGLSurface)sur)) { - LOGE("eglSwapBuffers error"); + ALOGE("eglSwapBuffers error"); err = HWC_EGL_ERROR; goto err_out; } @@ -1464,7 +1464,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy, __u32 crt = 0; int err2 = ioctl(hwc_dev->fb_fd, FBIO_WAITFORVSYNC, &crt); if (err2) { - LOGE("failed to wait for vsync (%d)", errno); + ALOGE("failed to wait for vsync (%d)", errno); err = err ? : -errno; } } @@ -1472,7 +1472,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy, hwc_dev->last_ext_ovls = hwc_dev->ext_ovls; hwc_dev->last_int_ovls = hwc_dev->post2_layers; if (err) - LOGE("Post2 error"); + ALOGE("Post2 error"); err_out: pthread_mutex_unlock(&hwc_dev->lock); @@ -1525,7 +1525,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_ FILE *fd = fopen(path, "rb"); if (!fd) { - LOGE("failed to open PNG file %s: (%d)", path, errno); + ALOGE("failed to open PNG file %s: (%d)", path, errno); return -EINVAL; } @@ -1533,7 +1533,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_ __u8 header[SIZE_PNG_HEADER]; fread(header, 1, SIZE_PNG_HEADER, fd); if (png_sig_cmp(header, 0, SIZE_PNG_HEADER)) { - LOGE("%s is not a PNG file", path); + ALOGE("%s is not a PNG file", path); goto fail; } @@ -1581,7 +1581,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_ png_set_bgr(png_ptr); break; default: - LOGE("unsupported PNG color: %x", color_type); + ALOGE("unsupported PNG color: %x", color_type); goto fail_alloc; } @@ -1591,14 +1591,14 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_ const int bpp = 4; img->size = ALIGN(width * height * bpp, 4096); if (img->size > hwc_dev->img_mem_size) { - LOGE("image does not fit into framebuffer area (%d > %d)", img->size, hwc_dev->img_mem_size); + ALOGE("image does not fit into framebuffer area (%d > %d)", img->size, hwc_dev->img_mem_size); goto fail_alloc; } img->ptr = hwc_dev->img_mem_ptr; row_pointers = calloc(height, sizeof(*row_pointers)); if (!row_pointers) { - LOGE("failed to allocate row pointers"); + ALOGE("failed to allocate row pointers"); goto fail_alloc; } __u32 i; @@ -1621,7 +1621,7 @@ fail_alloc: free_png_image(hwc_dev, img); free(row_pointers); if (!png_ptr || !info_ptr) - LOGE("failed to allocate PNG structures"); + ALOGE("failed to allocate PNG structures"); png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fail: fclose(fd); @@ -1670,7 +1670,7 @@ static int omap4_hwc_open_fb_hal(IMG_framebuffer_device_public_t **fb_dev) return 0; err_out: - LOGE("Composer HAL failed to load compatible Graphics HAL"); + ALOGE("Composer HAL failed to load compatible Graphics HAL"); return err; } @@ -1810,7 +1810,7 @@ static void *omap4_hwc_hdmi_thread(void *data) if (err == -1) { if (errno != EINTR) - LOGE("event error: %m"); + ALOGE("event error: %m"); continue; } @@ -1856,7 +1856,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name, return err; if (!hwc_mod->fb_dev) { - LOGE("Framebuffer HAL not opened before HWC"); + ALOGE("Framebuffer HAL not opened before HWC"); return -EFAULT; } hwc_mod->fb_dev->bBypassPost = 1; @@ -1881,28 +1881,28 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name, hwc_dev->dsscomp_fd = open("/dev/dsscomp", O_RDWR); if (hwc_dev->dsscomp_fd < 0) { - LOGE("failed to open dsscomp (%d)", errno); + ALOGE("failed to open dsscomp (%d)", errno); err = -errno; goto done; } hwc_dev->hdmi_fb_fd = open("/dev/graphics/fb1", O_RDWR); if (hwc_dev->hdmi_fb_fd < 0) { - LOGE("failed to open hdmi fb (%d)", errno); + ALOGE("failed to open hdmi fb (%d)", errno); err = -errno; goto done; } hwc_dev->fb_fd = open("/dev/graphics/fb0", O_RDWR); if (hwc_dev->fb_fd < 0) { - LOGE("failed to open fb (%d)", errno); + ALOGE("failed to open fb (%d)", errno); err = -errno; goto done; } struct fb_fix_screeninfo fix; if (ioctl(hwc_dev->fb_fd, FBIOGET_FSCREENINFO, &fix)) { - LOGE("failed to get fb info (%d)", errno); + ALOGE("failed to get fb info (%d)", errno); err = -errno; goto done; } @@ -1910,7 +1910,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name, hwc_dev->img_mem_size = fix.smem_len; hwc_dev->img_mem_ptr = mmap(NULL, fix.smem_len, PROT_WRITE, MAP_SHARED, hwc_dev->fb_fd, 0); if (hwc_dev->img_mem_ptr == MAP_FAILED) { - LOGE("failed to map fb memory"); + ALOGE("failed to map fb memory"); err = -errno; goto done; } @@ -1923,7 +1923,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name, int ret = ioctl(hwc_dev->dsscomp_fd, DSSCIOC_QUERY_DISPLAY, &hwc_dev->fb_dis); if (ret) { - LOGE("failed to get display info (%d): %m", errno); + ALOGE("failed to get display info (%d): %m", errno); err = -errno; goto done; } @@ -1931,19 +1931,19 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name, hwc_dev->fb_dis.height_in_mm * hwc_dev->fb_dis.timings.y_res; if (pipe(hwc_dev->pipe_fds) == -1) { - LOGE("failed to event pipe (%d): %m", errno); + ALOGE("failed to event pipe (%d): %m", errno); err = -errno; goto done; } if (pthread_mutex_init(&hwc_dev->lock, NULL)) { - LOGE("failed to create mutex (%d): %m", errno); + ALOGE("failed to create mutex (%d): %m", errno); err = -errno; goto done; } if (pthread_create(&hwc_dev->hdmi_thread, NULL, omap4_hwc_hdmi_thread, hwc_dev)) { - LOGE("failed to create HDMI listening thread (%d): %m", errno); + ALOGE("failed to create HDMI listening thread (%d): %m", errno); err = -errno; goto done; } @@ -35,7 +35,7 @@ int ion_open() { int fd = open("/dev/ion", O_RDWR); if (fd < 0) - LOGE("open /dev/ion failed!\n"); + ALOGE("open /dev/ion failed!\n"); return fd; } @@ -48,7 +48,7 @@ static int ion_ioctl(int fd, int req, void *arg) { int ret = ioctl(fd, req, arg); if (ret < 0) { - LOGE("ioctl %d failed with code %d: %s\n", req, + ALOGE("ioctl %d failed with code %d: %s\n", req, ret, strerror(errno)); return -errno; } @@ -115,12 +115,12 @@ int ion_map(int fd, struct ion_handle *handle, size_t length, int prot, return ret; *map_fd = data.fd; if (*map_fd < 0) { - LOGE("map ioctl returned negative fd\n"); + ALOGE("map ioctl returned negative fd\n"); return -EINVAL; } *ptr = mmap(NULL, length, prot, flags, *map_fd, offset); if (*ptr == MAP_FAILED) { - LOGE("mmap failed: %s\n", strerror(errno)); + ALOGE("mmap failed: %s\n", strerror(errno)); return -errno; } return ret; @@ -137,7 +137,7 @@ int ion_share(int fd, struct ion_handle *handle, int *share_fd) return ret; *share_fd = data.fd; if (*share_fd < 0) { - LOGE("map ioctl returned negative fd\n"); + ALOGE("map ioctl returned negative fd\n"); return -EINVAL; } return ret; diff --git a/libstagefrighthw/TIOMXPlugin.cpp b/libstagefrighthw/TIOMXPlugin.cpp index 14c5e91..de764c6 100644 --- a/libstagefrighthw/TIOMXPlugin.cpp +++ b/libstagefrighthw/TIOMXPlugin.cpp @@ -58,7 +58,7 @@ TIOMXPlugin::TIOMXPlugin() (*mInit)(); } else - LOGE("%s: failed to load %s", __func__, LIBOMX); + ALOGE("%s: failed to load %s", __func__, LIBOMX); } TIOMXPlugin::~TIOMXPlugin() { @@ -99,7 +99,7 @@ OMX_ERRORTYPE TIOMXPlugin::enumerateComponents( size_t size, OMX_U32 index) { if (mLibHandle == NULL) { - LOGE("mLibHandle is NULL!"); + ALOGE("mLibHandle is NULL!"); return OMX_ErrorUndefined; } diff --git a/libtiutils/DebugUtils.h b/libtiutils/DebugUtils.h index 27f823d..f421252 100644 --- a/libtiutils/DebugUtils.h +++ b/libtiutils/DebugUtils.h @@ -24,8 +24,8 @@ #define DBGUTILS_LOGVB(str,...) ALOGV("%s:%d %s - " str,__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__); #define DBGUTILS_LOGDA(str) ALOGD("%s:%d %s - " str,__FILE__, __LINE__,__FUNCTION__); #define DBGUTILS_LOGDB(str, ...) ALOGD("%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 DBGUTILS_LOGEA(str) ALOGE("%s:%d %s - " str,__FILE__, __LINE__, __FUNCTION__); +#define DBGUTILS_LOGEB(str, ...) ALOGE("%s:%d %s - " str,__FILE__, __LINE__,__FUNCTION__, __VA_ARGS__); #define LOG_FUNCTION_NAME ALOGV("%d: %s() ENTER", __LINE__, __FUNCTION__); #define LOG_FUNCTION_NAME_EXIT ALOGV("%d: %s() EXIT", __LINE__, __FUNCTION__); diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index f8ef2b1..69f1c65 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -513,19 +513,19 @@ void saveFile(const sp<IMemory>& mem) { sprintf(fn, "/sdcard/preview%03d.yuv", counter); fd = open(fn, O_CREAT | O_WRONLY | 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)); goto out; } size = mem->size(); if (size <= 0) { - LOGE("IMemory object is of zero size"); + ALOGE("IMemory object is of zero size"); goto out; } buff = (unsigned char *)mem->pointer(); if (!buff) { - LOGE("Buffer pointer is invalid"); + ALOGE("Buffer pointer is invalid"); goto out; } @@ -603,19 +603,19 @@ void my_jpeg_callback(const sp<IMemory>& mem) { fd = open(fn, O_CREAT | O_WRONLY | O_TRUNC, 0777); if(fd < 0) { - LOGE("Unable to open file %s: %s", fn, strerror(fd)); + ALOGE("Unable to open file %s: %s", fn, strerror(fd)); goto out; } size = mem->size(); if (size <= 0) { - LOGE("IMemory object is of zero size"); + ALOGE("IMemory object is of zero size"); goto out; } buff = (unsigned char *)mem->pointer(); if (!buff) { - LOGE("Buffer pointer is invalid"); + ALOGE("Buffer pointer is invalid"); goto out; } |