From fc4d70454282d831c697e50d7e77bdcd938b2bb4 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 20 Oct 2011 11:56:21 +0100 Subject: Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I73e1ab4f4eadb55e747b3b2be4b6c1824dce7b2c --- libcamera/SecCamera.cpp | 212 ++++++++++++++++++------------------- libcamera/SecCameraHWInterface.cpp | 188 ++++++++++++++++---------------- 2 files changed, 200 insertions(+), 200 deletions(-) (limited to 'libcamera') diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 48cf02e..fdc3bb3 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -303,7 +303,7 @@ static int fimc_v4l2_enum_fmt(int fp, unsigned int fmt) while (ioctl(fp, VIDIOC_ENUM_FMT, &fmtdesc) == 0) { if (fmtdesc.pixelformat == fmt) { - LOGV("passed fmt = %#x found pixel format[%d]: %s\n", fmt, fmtdesc.index, fmtdesc.description); + ALOGV("passed fmt = %#x found pixel format[%d]: %s\n", fmt, fmtdesc.index, fmtdesc.description); found = 1; break; } @@ -387,7 +387,7 @@ static int fimc_v4l2_streamoff(int fp) enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); ret = ioctl(fp, VIDIOC_STREAMOFF, &type); if (ret < 0) { LOGE("ERR(%s):VIDIOC_STREAMOFF failed\n", __func__); @@ -500,7 +500,7 @@ static int fimc_v4l2_g_parm(int fp, struct v4l2_streamparm *streamparm) return -1; } - LOGV("%s : timeperframe: numerator %d, denominator %d\n", __func__, + ALOGV("%s : timeperframe: numerator %d, denominator %d\n", __func__, streamparm->parm.capture.timeperframe.numerator, streamparm->parm.capture.timeperframe.denominator); @@ -590,17 +590,17 @@ SecCamera::SecCamera() : memset(&m_capture_buf, 0, sizeof(m_capture_buf)); - LOGV("%s :", __func__); + ALOGV("%s :", __func__); } SecCamera::~SecCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); } int SecCamera::initCamera(int index) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int ret = 0; if (!m_flag_init) { @@ -615,7 +615,7 @@ int SecCamera::initCamera(int index) LOGE("ERR(%s):Cannot open %s (error : %s)\n", __func__, CAMERA_DEV_NAME, strerror(errno)); return -1; } - LOGV("%s: open(%s) --> m_cam_fd %d", __FUNCTION__, CAMERA_DEV_NAME, m_cam_fd); + ALOGV("%s: open(%s) --> m_cam_fd %d", __FUNCTION__, CAMERA_DEV_NAME, m_cam_fd); LOGE("initCamera: m_cam_fd(%d), m_jpeg_fd(%d)", m_cam_fd, m_jpeg_fd); @@ -627,7 +627,7 @@ int SecCamera::initCamera(int index) CHECK(ret); m_cam_fd2 = open(CAMERA_DEV_NAME2, O_RDWR); - LOGV("%s: open(%s) --> m_cam_fd2 = %d", __FUNCTION__, CAMERA_DEV_NAME2, m_cam_fd2); + ALOGV("%s: open(%s) --> m_cam_fd2 = %d", __FUNCTION__, CAMERA_DEV_NAME2, m_cam_fd2); if (m_cam_fd2 < 0) { LOGE("ERR(%s):Cannot open %s (error : %s)\n", __func__, CAMERA_DEV_NAME2, strerror(errno)); return -1; @@ -670,14 +670,14 @@ int SecCamera::initCamera(int index) void SecCamera::resetCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); DeinitCamera(); initCamera(m_camera_id); } void SecCamera::DeinitCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_init) { @@ -717,7 +717,7 @@ int SecCamera::startPreview(void) v4l2_streamparm streamparm; struct sec_cam_parm *parms; parms = (struct sec_cam_parm*)&streamparm.parm.raw_data; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // aleady started if (m_flag_camera_start > 0) { @@ -743,7 +743,7 @@ int SecCamera::startPreview(void) ret = fimc_v4l2_reqbufs(m_cam_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE, MAX_BUFFERS); CHECK(ret); - LOGV("%s : m_preview_width: %d m_preview_height: %d m_angle: %d\n", + ALOGV("%s : m_preview_width: %d m_preview_height: %d m_angle: %d\n", __func__, m_preview_width, m_preview_height, m_angle); ret = fimc_v4l2_s_ctrl(m_cam_fd, @@ -772,7 +772,7 @@ int SecCamera::startPreview(void) if (m_camera_id == CAMERA_ID_FRONT) { /* Blur setting */ - LOGV("m_blur_level = %d", m_blur_level); + ALOGV("m_blur_level = %d", m_blur_level); ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_VGA_BLUR, m_blur_level); CHECK(ret); @@ -784,7 +784,7 @@ int SecCamera::startPreview(void) ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_RETURN_FOCUS, 0); CHECK(ret); - LOGV("%s: got the first frame of the preview\n", __func__); + ALOGV("%s: got the first frame of the preview\n", __func__); return 0; } @@ -793,7 +793,7 @@ int SecCamera::stopPreview(void) { int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_camera_start == 0) { LOGW("%s: doing nothing because m_flag_camera_start is zero", __func__); @@ -821,7 +821,7 @@ int SecCamera::startRecord(void) { int ret, i; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // aleady started if (m_flag_record_start > 0) { @@ -877,7 +877,7 @@ int SecCamera::stopRecord(void) { int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_record_start == 0) { LOGW("%s: doing nothing because m_flag_record_start is zero", __func__); @@ -1012,27 +1012,27 @@ int SecCamera::releaseRecordFrame(int index) int SecCamera::setPreviewSize(int width, int height, int pixel_format) { - LOGV("%s(width(%d), height(%d), format(%d))", __func__, width, height, pixel_format); + ALOGV("%s(width(%d), height(%d), format(%d))", __func__, width, height, pixel_format); int v4lpixelformat = pixel_format; #if defined(LOG_NDEBUG) && LOG_NDEBUG == 0 if (v4lpixelformat == V4L2_PIX_FMT_YUV420) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUV420"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUV420"); else if (v4lpixelformat == V4L2_PIX_FMT_NV12) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV12"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV12"); else if (v4lpixelformat == V4L2_PIX_FMT_NV12T) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV12T"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV12T"); else if (v4lpixelformat == V4L2_PIX_FMT_NV21) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV21"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV21"); else if (v4lpixelformat == V4L2_PIX_FMT_YUV422P) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUV422P"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUV422P"); else if (v4lpixelformat == V4L2_PIX_FMT_YUYV) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUYV"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUYV"); else if (v4lpixelformat == V4L2_PIX_FMT_RGB565) - LOGV("PreviewFormat:V4L2_PIX_FMT_RGB565"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_RGB565"); else - LOGV("PreviewFormat:UnknownFormat"); + ALOGV("PreviewFormat:UnknownFormat"); #endif m_preview_width = width; m_preview_height = height; @@ -1072,7 +1072,7 @@ int SecCamera::getPreviewPixelFormat(void) */ int SecCamera::setSnapshotCmd(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int ret = 0; @@ -1137,7 +1137,7 @@ int SecCamera::endSnapshot(void) */ unsigned char* SecCamera::getJpeg(int *jpeg_size, unsigned int *phyaddr) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int index, ret = 0; unsigned char *addr; @@ -1163,7 +1163,7 @@ unsigned char* SecCamera::getJpeg(int *jpeg_size, unsigned int *phyaddr) ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_STREAM_PAUSE, 0); CHECK_PTR(ret); - LOGV("\nsnapshot dqueued buffer = %d snapshot_width = %d snapshot_height = %d, size = %d\n\n", + ALOGV("\nsnapshot dqueued buffer = %d snapshot_width = %d snapshot_height = %d, size = %d\n\n", index, m_snapshot_width, m_snapshot_height, *jpeg_size); addr = (unsigned char*)(m_capture_buf.start) + main_offset; @@ -1181,7 +1181,7 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) { JpegEncoder jpgEnc; - LOGV("%s : m_jpeg_thumbnail_width = %d, height = %d", + ALOGV("%s : m_jpeg_thumbnail_width = %d, height = %d", __func__, m_jpeg_thumbnail_width, m_jpeg_thumbnail_height); if ((m_jpeg_thumbnail_width > 0) && (m_jpeg_thumbnail_height > 0)) { int inFormat = JPG_MODESEL_YCBCR; @@ -1226,10 +1226,10 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) jpgEnc.encode(&thumbSize, NULL); - LOGV("%s : enableThumb set to true", __func__); + ALOGV("%s : enableThumb set to true", __func__); mExifInfo.enableThumb = true; } else { - LOGV("%s : enableThumb set to false", __func__); + ALOGV("%s : enableThumb set to false", __func__); mExifInfo.enableThumb = false; } @@ -1237,7 +1237,7 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) setExifChangedAttribute(); - LOGV("%s: calling jpgEnc.makeExif, mExifInfo.width set to %d, height to %d\n", + ALOGV("%s: calling jpgEnc.makeExif, mExifInfo.width set to %d, height to %d\n", __func__, mExifInfo.width, mExifInfo.height); jpgEnc.makeExif(pExifDst, &mExifInfo, &exifSize, true); @@ -1256,7 +1256,7 @@ void SecCamera::getPostViewConfig(int *width, int *height, int *size) *height = BACK_CAMERA_POSTVIEW_HEIGHT; *size = BACK_CAMERA_POSTVIEW_WIDTH * BACK_CAMERA_POSTVIEW_HEIGHT * BACK_CAMERA_POSTVIEW_BPP / 8; } - LOGV("[5B] m_preview_width : %d, mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("[5B] m_preview_width : %d, mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", m_preview_width, *width, *height, *size); } @@ -1283,7 +1283,7 @@ int SecCamera::getPostViewOffset(void) int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_buf, unsigned int *output_size) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int index; //unsigned int addr; @@ -1317,23 +1317,23 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu #if defined(LOG_NDEBUG) && LOG_NDEBUG == 0 if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUV420) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUV420"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUV420"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV12) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV12"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV12"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV12T) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV12T"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV12T"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV21) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV21"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV21"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUV422P) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUV422P"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUV422P"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUYV) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUYV"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUYV"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_UYVY) - LOGV("SnapshotFormat:V4L2_PIX_FMT_UYVY"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_UYVY"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_RGB565) - LOGV("SnapshotFormat:V4L2_PIX_FMT_RGB565"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_RGB565"); else - LOGV("SnapshotFormat:UnknownFormat"); + ALOGV("SnapshotFormat:UnknownFormat"); #endif LOG_TIME_START(1) // prepare @@ -1359,7 +1359,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu fimc_poll(&m_events_c); index = fimc_v4l2_dqbuf(m_cam_fd); fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_STREAM_PAUSE, 0); - LOGV("\nsnapshot dequeued buffer = %d snapshot_width = %d snapshot_height = %d\n\n", + ALOGV("\nsnapshot dequeued buffer = %d snapshot_width = %d snapshot_height = %d\n\n", index, m_snapshot_width, m_snapshot_height); LOG_TIME_END(2) @@ -1445,7 +1445,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu int SecCamera::setSnapshotSize(int width, int height) { - LOGV("%s(width(%d), height(%d))", __func__, width, height); + ALOGV("%s(width(%d), height(%d))", __func__, width, height); m_snapshot_width = width; m_snapshot_height = height; @@ -1540,7 +1540,7 @@ int SecCamera::getCameraId(void) int SecCamera::setAutofocus(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1561,14 +1561,14 @@ int SecCamera::getAutoFocusResult(void) af_result = fimc_v4l2_g_ctrl(m_cam_fd, V4L2_CID_CAMERA_AUTO_FOCUS_RESULT); - LOGV("%s : returning %d", __func__, af_result); + ALOGV("%s : returning %d", __func__, af_result); return af_result; } int SecCamera::cancelAutofocus(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1587,13 +1587,13 @@ int SecCamera::cancelAutofocus(void) int SecCamera::zoomIn(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return 0; } int SecCamera::zoomOut(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return 0; } @@ -1644,13 +1644,13 @@ int SecCamera::SetRotate(int angle) int SecCamera::getRotate(void) { - LOGV("%s : angle(%d)", __func__, m_angle); + ALOGV("%s : angle(%d)", __func__, m_angle); return m_angle; } int SecCamera::setFrameRate(int frame_rate) { - LOGV("%s(FrameRate(%d))", __func__, frame_rate); + ALOGV("%s(FrameRate(%d))", __func__, frame_rate); if (frame_rate < FRAME_RATE_AUTO || FRAME_RATE_MAX < frame_rate ) LOGE("ERR(%s):Invalid frame_rate(%d)", __func__, frame_rate); @@ -1672,7 +1672,7 @@ int SecCamera::setFrameRate(int frame_rate) int SecCamera::setVerticalMirror(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1689,7 +1689,7 @@ int SecCamera::setVerticalMirror(void) int SecCamera::setHorizontalMirror(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1708,7 +1708,7 @@ int SecCamera::setHorizontalMirror(void) int SecCamera::setWhiteBalance(int white_balance) { - LOGV("%s(white_balance(%d))", __func__, white_balance); + ALOGV("%s(white_balance(%d))", __func__, white_balance); if (white_balance <= WHITE_BALANCE_BASE || WHITE_BALANCE_MAX <= white_balance) { LOGE("ERR(%s):Invalid white_balance(%d)", __func__, white_balance); @@ -1730,7 +1730,7 @@ int SecCamera::setWhiteBalance(int white_balance) int SecCamera::getWhiteBalance(void) { - LOGV("%s : white_balance(%d)", __func__, m_params->white_balance); + ALOGV("%s : white_balance(%d)", __func__, m_params->white_balance); return m_params->white_balance; } @@ -1738,7 +1738,7 @@ int SecCamera::getWhiteBalance(void) int SecCamera::setBrightness(int brightness) { - LOGV("%s(brightness(%d))", __func__, brightness); + ALOGV("%s(brightness(%d))", __func__, brightness); brightness += EV_DEFAULT; @@ -1762,7 +1762,7 @@ int SecCamera::setBrightness(int brightness) int SecCamera::getBrightness(void) { - LOGV("%s : brightness(%d)", __func__, m_params->brightness); + ALOGV("%s : brightness(%d)", __func__, m_params->brightness); return m_params->brightness; } @@ -1770,7 +1770,7 @@ int SecCamera::getBrightness(void) int SecCamera::setImageEffect(int image_effect) { - LOGV("%s(image_effect(%d))", __func__, image_effect); + ALOGV("%s(image_effect(%d))", __func__, image_effect); if (image_effect <= IMAGE_EFFECT_BASE || IMAGE_EFFECT_MAX <= image_effect) { LOGE("ERR(%s):Invalid image_effect(%d)", __func__, image_effect); @@ -1792,14 +1792,14 @@ int SecCamera::setImageEffect(int image_effect) int SecCamera::getImageEffect(void) { - LOGV("%s : image_effect(%d)", __func__, m_params->effects); + ALOGV("%s : image_effect(%d)", __func__, m_params->effects); return m_params->effects; } // ====================================================================== int SecCamera::setAntiBanding(int anti_banding) { - LOGV("%s(anti_banding(%d))", __func__, anti_banding); + ALOGV("%s(anti_banding(%d))", __func__, anti_banding); if (anti_banding < ANTI_BANDING_AUTO || ANTI_BANDING_OFF < anti_banding) { LOGE("ERR(%s):Invalid anti_banding (%d)", __func__, anti_banding); @@ -1822,7 +1822,7 @@ int SecCamera::setAntiBanding(int anti_banding) //====================================================================== int SecCamera::setSceneMode(int scene_mode) { - LOGV("%s(scene_mode(%d))", __func__, scene_mode); + ALOGV("%s(scene_mode(%d))", __func__, scene_mode); if (scene_mode <= SCENE_MODE_BASE || SCENE_MODE_MAX <= scene_mode) { LOGE("ERR(%s):Invalid scene_mode (%d)", __func__, scene_mode); @@ -1851,7 +1851,7 @@ int SecCamera::getSceneMode(void) int SecCamera::setFlashMode(int flash_mode) { - LOGV("%s(flash_mode(%d))", __func__, flash_mode); + ALOGV("%s(flash_mode(%d))", __func__, flash_mode); if (flash_mode <= FLASH_MODE_BASE || FLASH_MODE_MAX <= flash_mode) { LOGE("ERR(%s):Invalid flash_mode (%d)", __func__, flash_mode); @@ -1880,7 +1880,7 @@ int SecCamera::getFlashMode(void) int SecCamera::setISO(int iso_value) { - LOGV("%s(iso_value(%d))", __func__, iso_value); + ALOGV("%s(iso_value(%d))", __func__, iso_value); if (iso_value < ISO_AUTO || ISO_MAX <= iso_value) { LOGE("ERR(%s):Invalid iso_value (%d)", __func__, iso_value); return -1; @@ -1908,7 +1908,7 @@ int SecCamera::getISO(void) int SecCamera::setContrast(int contrast_value) { - LOGV("%s(contrast_value(%d))", __func__, contrast_value); + ALOGV("%s(contrast_value(%d))", __func__, contrast_value); if (contrast_value < CONTRAST_MINUS_2 || CONTRAST_MAX <= contrast_value) { LOGE("ERR(%s):Invalid contrast_value (%d)", __func__, contrast_value); @@ -1937,7 +1937,7 @@ int SecCamera::getContrast(void) int SecCamera::setSaturation(int saturation_value) { - LOGV("%s(saturation_value(%d))", __func__, saturation_value); + ALOGV("%s(saturation_value(%d))", __func__, saturation_value); if (saturation_value getPostViewConfig(&mPostViewWidth, &mPostViewHeight, &mPostViewSize); - LOGV("mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", mPostViewWidth,mPostViewHeight,mPostViewSize); initDefaultParameters(cameraId); @@ -146,7 +146,7 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) CameraParameters ip; mCameraSensorName = mSecCamera->getCameraSensorName(); - LOGV("CameraSensorName: %s", mCameraSensorName); + ALOGV("CameraSensorName: %s", mCameraSensorName); int preview_max_width = 0; int preview_max_height = 0; @@ -358,7 +358,7 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) CameraHardwareSec::~CameraHardwareSec() { - LOGV("%s", __func__); + ALOGV("%s", __func__); mSecCamera->DeinitCamera(); } @@ -367,7 +367,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) int min_bufs; mPreviewWindow = w; - LOGV("%s: mPreviewWindow %p", __func__, mPreviewWindow); + ALOGV("%s: mPreviewWindow %p", __func__, mPreviewWindow); if (!w) { LOGE("preview window is NULL!"); @@ -391,7 +391,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) min_bufs, kBufferCount - 1); } - LOGV("%s: setting buffer count to %d", __func__, kBufferCount); + ALOGV("%s: setting buffer count to %d", __func__, kBufferCount); if (w->set_buffer_count(w, kBufferCount)) { LOGE("%s: could not set buffer count", __func__); return INVALID_OPERATION; @@ -403,7 +403,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) int hal_pixel_format = HAL_PIXEL_FORMAT_YV12; const char *str_preview_format = mParameters.getPreviewFormat(); - LOGV("%s: preview format %s", __func__, str_preview_format); + ALOGV("%s: preview format %s", __func__, str_preview_format); mFrameSizeDelta = 16; if (w->set_usage(w, GRALLOC_USAGE_SW_WRITE_OFTEN)) { @@ -420,7 +420,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) } if (mPreviewRunning && mPreviewStartDeferred) { - LOGV("start/resume preview"); + ALOGV("start/resume preview"); status_t ret = startPreviewInternal(); if (ret == OK) { mPreviewStartDeferred = false; @@ -447,19 +447,19 @@ void CameraHardwareSec::setCallbacks(camera_notify_callback notify_cb, void CameraHardwareSec::enableMsgType(int32_t msgType) { - LOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", + ALOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", __func__, msgType, mMsgEnabled); mMsgEnabled |= msgType; - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); } void CameraHardwareSec::disableMsgType(int32_t msgType) { - LOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", + ALOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", __func__, msgType, mMsgEnabled); mMsgEnabled &= ~msgType; - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); } bool CameraHardwareSec::msgTypeEnabled(int32_t msgType) @@ -515,13 +515,13 @@ int CameraHardwareSec::previewThread() return UNKNOWN_ERROR; } -// LOGV("%s: index %d", __func__, index); +// ALOGV("%s: index %d", __func__, index); mSkipFrameLock.lock(); if (mSkipFrame > 0) { mSkipFrame--; mSkipFrameLock.unlock(); - LOGV("%s: index %d skipping frame", __func__, index); + ALOGV("%s: index %d skipping frame", __func__, index); return NO_ERROR; } mSkipFrameLock.unlock(); @@ -672,7 +672,7 @@ status_t CameraHardwareSec::startPreview() { int ret = 0; //s1 [Apply factory standard] - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (waitCaptureCompletion() != NO_ERROR) { return TIMED_OUT; @@ -706,10 +706,10 @@ status_t CameraHardwareSec::startPreview() status_t CameraHardwareSec::startPreviewInternal() { - LOGV("%s", __func__); + ALOGV("%s", __func__); int ret = mSecCamera->startPreview(); - LOGV("%s : mSecCamera->startPreview() returned %d", __func__, ret); + ALOGV("%s : mSecCamera->startPreview() returned %d", __func__, ret); if (ret < 0) { LOGE("ERR(%s):Fail on mSecCamera->startPreview()", __func__); @@ -735,7 +735,7 @@ status_t CameraHardwareSec::startPreviewInternal() 0); // no cookie mSecCamera->getPostViewConfig(&mPostViewWidth, &mPostViewHeight, &mPostViewSize); - LOGV("CameraHardwareSec: mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("CameraHardwareSec: mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", mPostViewWidth,mPostViewHeight,mPostViewSize); return NO_ERROR; @@ -743,7 +743,7 @@ status_t CameraHardwareSec::startPreviewInternal() void CameraHardwareSec::stopPreviewInternal() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* request that the preview thread stop. */ if (mPreviewRunning) { @@ -754,14 +754,14 @@ void CameraHardwareSec::stopPreviewInternal() mPreviewStoppedCondition.wait(mPreviewLock); } else - LOGV("%s : preview running but deferred, doing nothing", __func__); + ALOGV("%s : preview running but deferred, doing nothing", __func__); } else LOGI("%s : preview not running, doing nothing", __func__); } void CameraHardwareSec::stopPreview() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* request that the preview thread stop. */ mPreviewLock.lock(); @@ -772,7 +772,7 @@ void CameraHardwareSec::stopPreview() bool CameraHardwareSec::previewEnabled() { Mutex::Autolock lock(mPreviewLock); - LOGV("%s : %d", __func__, mPreviewRunning); + ALOGV("%s : %d", __func__, mPreviewRunning); return mPreviewRunning; } @@ -780,7 +780,7 @@ bool CameraHardwareSec::previewEnabled() status_t CameraHardwareSec::startRecording() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); Mutex::Autolock lock(mRecordLock); @@ -806,7 +806,7 @@ status_t CameraHardwareSec::startRecording() void CameraHardwareSec::stopRecording() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); Mutex::Autolock lock(mRecordLock); @@ -821,7 +821,7 @@ void CameraHardwareSec::stopRecording() bool CameraHardwareSec::recordingEnabled() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return mRecordRunning; } @@ -839,7 +839,7 @@ int CameraHardwareSec::autoFocusThread() int count =0; int af_status =0 ; - LOGV("%s : starting", __func__); + ALOGV("%s : starting", __func__); /* block until we're told to start. we don't want to use * a restartable thread and requestExitAndWait() in cancelAutoFocus() @@ -851,19 +851,19 @@ int CameraHardwareSec::autoFocusThread() /* check early exit request */ if (mExitAutoFocusThread) { mFocusLock.unlock(); - LOGV("%s : exiting on request0", __func__); + ALOGV("%s : exiting on request0", __func__); return NO_ERROR; } mFocusCondition.wait(mFocusLock); /* check early exit request */ if (mExitAutoFocusThread) { mFocusLock.unlock(); - LOGV("%s : exiting on request1", __func__); + ALOGV("%s : exiting on request1", __func__); return NO_ERROR; } mFocusLock.unlock(); - LOGV("%s : calling setAutoFocus", __func__); + ALOGV("%s : calling setAutoFocus", __func__); if (mSecCamera->setAutofocus() < 0) { LOGE("ERR(%s):Fail on mSecCamera->setAutofocus()", __func__); return UNKNOWN_ERROR; @@ -872,11 +872,11 @@ int CameraHardwareSec::autoFocusThread() af_status = mSecCamera->getAutoFocusResult(); if (af_status == 0x01) { - LOGV("%s : AF Success!!", __func__); + ALOGV("%s : AF Success!!", __func__); if (mMsgEnabled & CAMERA_MSG_FOCUS) mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); } else if (af_status == 0x02) { - LOGV("%s : AF Cancelled !!", __func__); + ALOGV("%s : AF Cancelled !!", __func__); if (mMsgEnabled & CAMERA_MSG_FOCUS) { /* CAMERA_MSG_FOCUS only takes a bool. true for * finished and false for failure. cancel is still @@ -885,19 +885,19 @@ int CameraHardwareSec::autoFocusThread() mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); } } else { - LOGV("%s : AF Fail !!", __func__); - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : AF Fail !!", __func__); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); if (mMsgEnabled & CAMERA_MSG_FOCUS) mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie); } - LOGV("%s : exiting with no error", __func__); + ALOGV("%s : exiting with no error", __func__); return NO_ERROR; } status_t CameraHardwareSec::autoFocus() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* signal autoFocusThread to run once */ mFocusCondition.signal(); return NO_ERROR; @@ -906,7 +906,7 @@ status_t CameraHardwareSec::autoFocus() /* 2009.10.14 by icarus for added interface */ status_t CameraHardwareSec::cancelAutoFocus() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // cancelAutoFocus should be allowed after preview is started. But if // the preview is deferred, cancelAutoFocus will fail. Ignore it if that is @@ -933,7 +933,7 @@ int CameraHardwareSec::save_jpeg( unsigned char *real_jpeg, int jpeg_size) return -1; } - LOGV("[BestIQ] real_jpeg size ========> %d\n", jpeg_size); + ALOGV("[BestIQ] real_jpeg size ========> %d\n", jpeg_size); buffer = (char *) malloc(jpeg_size); if (buffer == NULL) { LOGE("Save YUV] buffer alloc failed"); @@ -1051,7 +1051,7 @@ bool CameraHardwareSec::YUY2toNV21(void *srcBuf, void *dstBuf, uint32_t srcWidth int CameraHardwareSec::pictureThread() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int jpeg_size = 0; int ret = NO_ERROR; @@ -1086,7 +1086,7 @@ int CameraHardwareSec::pictureThread() addrs[0].width = mPostViewWidth; addrs[0].height = mPostViewHeight; - LOGV("[5B] mPostViewWidth = %d mPostViewHeight = %d\n",mPostViewWidth,mPostViewHeight); + ALOGV("[5B] mPostViewWidth = %d mPostViewHeight = %d\n",mPostViewWidth,mPostViewHeight); camera_memory_t *JpegHeap = mGetMemoryCb(-1, mJpegHeapSize, 1, 0); sp PostviewHeap = new MemoryHeapBase(mPostViewSize); @@ -1167,7 +1167,7 @@ int CameraHardwareSec::pictureThread() JpegExifSize = mSecCamera->getExif((unsigned char *)ExifHeap->data, (unsigned char *)ThumbnailHeap->base()); - LOGV("JpegExifSize=%d", JpegExifSize); + ALOGV("JpegExifSize=%d", JpegExifSize); if (JpegExifSize < 0) { ret = UNKNOWN_ERROR; @@ -1188,7 +1188,7 @@ int CameraHardwareSec::pictureThread() LOG_TIME_END(0) LOG_CAMERA("pictureThread interval: %lu us", LOG_TIME(0)); - LOGV("%s : pictureThread end", __func__); + ALOGV("%s : pictureThread end", __func__); out: JpegHeap->release(JpegHeap); @@ -1219,13 +1219,13 @@ status_t CameraHardwareSec::waitCaptureCompletion() { status_t CameraHardwareSec::takePicture() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); stopPreview(); if (!mRawHeap) { int rawHeapSize = mPostViewSize; - LOGV("mRawHeap : MemoryHeapBase(previewHeapSize(%d))", rawHeapSize); + ALOGV("mRawHeap : MemoryHeapBase(previewHeapSize(%d))", rawHeapSize); mRawHeap = mGetMemoryCb(-1, rawHeapSize, 1, 0); if (!mRawHeap) { LOGE("ERR(%s): Raw heap creation fail", __func__); @@ -1249,12 +1249,12 @@ status_t CameraHardwareSec::takePicture() status_t CameraHardwareSec::cancelPicture() { - LOGV("%s", __func__); + ALOGV("%s", __func__); if (mPictureThread.get()) { - LOGV("%s: waiting for picture thread to exit", __func__); + ALOGV("%s: waiting for picture thread to exit", __func__); mPictureThread->requestExitAndWait(); - LOGV("%s: picture thread has exited", __func__); + ALOGV("%s: picture thread has exited", __func__); } return NO_ERROR; @@ -1312,7 +1312,7 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, void *pJPEG, int *pdwJPEGSize, void *pVideo, int *pdwVideoSize) { - LOGV("===========SplitFrame Start=============="); + ALOGV("===========SplitFrame Start=============="); if (NULL == pFrame || 0 >= dwSize) { LOGE("There is no contents (pFrame=%p, dwSize=%d", pFrame, dwSize); @@ -1396,7 +1396,7 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, if(pdwVideoSize) *pdwVideoSize = 0; } - LOGV("===========SplitFrame end=============="); + ALOGV("===========SplitFrame end=============="); return bRet; } @@ -1422,7 +1422,7 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, int i = 0; - LOGV("decodeInterleaveData Start~~~"); + ALOGV("decodeInterleaveData Start~~~"); while (i < interleaveDataSize) { if ((*interleave_ptr == 0xFFFFFFFF) || (*interleave_ptr == 0x02FFFFFF) || (*interleave_ptr == 0xFF02FFFF)) { @@ -1486,7 +1486,7 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, } } } - LOGV("decodeInterleaveData End~~~"); + ALOGV("decodeInterleaveData End~~~"); return ret; } @@ -1553,7 +1553,7 @@ bool CameraHardwareSec::isSupportedParameter(const char * const parm, status_t CameraHardwareSec::setParameters(const CameraParameters& params) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); status_t ret = NO_ERROR; @@ -1569,7 +1569,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_preview_height = 0; params.getPreviewSize(&new_preview_width, &new_preview_height); const char *new_str_preview_format = params.getPreviewFormat(); - LOGV("%s : new_preview_width x new_preview_height = %dx%d, format = %s", + ALOGV("%s : new_preview_width x new_preview_height = %dx%d, format = %s", __func__, new_preview_width, new_preview_height, new_str_preview_format); if (strcmp(new_str_preview_format, CameraParameters::PIXEL_FORMAT_YUV420SP) && @@ -1606,20 +1606,20 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) ret = INVALID_OPERATION; } - LOGV("%s: mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); - LOGV("%s: mPreviewWindow->set_buffers_geometry (%p)", __func__, + ALOGV("%s: mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); + ALOGV("%s: mPreviewWindow->set_buffers_geometry (%p)", __func__, mPreviewWindow->set_buffers_geometry); mPreviewWindow->set_buffers_geometry(mPreviewWindow, new_preview_width, new_preview_height, new_preview_format); - LOGV("%s: DONE mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); + ALOGV("%s: DONE mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); } mParameters.setPreviewSize(new_preview_width, new_preview_height); mParameters.setPreviewFormat(new_str_preview_format); } } - else LOGV("%s: preview size and format has not changed", __func__); + else ALOGV("%s: preview size and format has not changed", __func__); } else { LOGE("%s: Invalid preview size(%dx%d)", __func__, new_preview_width, new_preview_height); @@ -1631,9 +1631,9 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_picture_height = 0; params.getPictureSize(&new_picture_width, &new_picture_height); - LOGV("%s : new_picture_width x new_picture_height = %dx%d", __func__, new_picture_width, new_picture_height); + ALOGV("%s : new_picture_width x new_picture_height = %dx%d", __func__, new_picture_width, new_picture_height); if (0 < new_picture_width && 0 < new_picture_height) { - LOGV("%s: setSnapshotSize", __func__); + ALOGV("%s: setSnapshotSize", __func__); if (mSecCamera->setSnapshotSize(new_picture_width, new_picture_height) < 0) { LOGE("ERR(%s):Fail on mSecCamera->setSnapshotSize(width(%d), height(%d))", __func__, new_picture_width, new_picture_height); @@ -1645,7 +1645,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // picture format const char *new_str_picture_format = params.getPictureFormat(); - LOGV("%s : new_str_picture_format %s", __func__, new_str_picture_format); + ALOGV("%s : new_str_picture_format %s", __func__, new_str_picture_format); if (new_str_picture_format != NULL) { int new_picture_format = 0; @@ -1682,7 +1682,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) //JPEG image quality int new_jpeg_quality = params.getInt(CameraParameters::KEY_JPEG_QUALITY); - LOGV("%s : new_jpeg_quality %d", __func__, new_jpeg_quality); + ALOGV("%s : new_jpeg_quality %d", __func__, new_jpeg_quality); /* we ignore bad values */ if (new_jpeg_quality >=1 && new_jpeg_quality <= 100) { if (mSecCamera->setJpegQuality(new_jpeg_quality) < 0) { @@ -1718,9 +1718,9 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // rotation int new_rotation = params.getInt(CameraParameters::KEY_ROTATION); - LOGV("%s : new_rotation %d", __func__, new_rotation); + ALOGV("%s : new_rotation %d", __func__, new_rotation); if (0 <= new_rotation) { - LOGV("%s : set orientation:%d\n", __func__, new_rotation); + ALOGV("%s : set orientation:%d\n", __func__, new_rotation); if (mSecCamera->setExifOrientationInfo(new_rotation) < 0) { LOGE("ERR(%s):Fail on mSecCamera->setExifOrientationInfo(%d)", __func__, new_rotation); ret = UNKNOWN_ERROR; @@ -1733,7 +1733,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_exposure_compensation = params.getInt(CameraParameters::KEY_EXPOSURE_COMPENSATION); int max_exposure_compensation = params.getInt(CameraParameters::KEY_MAX_EXPOSURE_COMPENSATION); int min_exposure_compensation = params.getInt(CameraParameters::KEY_MIN_EXPOSURE_COMPENSATION); - LOGV("%s : new_exposure_compensation %d", __func__, new_exposure_compensation); + ALOGV("%s : new_exposure_compensation %d", __func__, new_exposure_compensation); if ((min_exposure_compensation <= new_exposure_compensation) && (max_exposure_compensation >= new_exposure_compensation)) { if (mSecCamera->setBrightness(new_exposure_compensation) < 0) { @@ -1746,7 +1746,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // whitebalance const char *new_white_str = params.get(CameraParameters::KEY_WHITE_BALANCE); - LOGV("%s : new_white_str %s", __func__, new_white_str); + ALOGV("%s : new_white_str %s", __func__, new_white_str); if (new_white_str != NULL) { int new_white = -1; @@ -2224,14 +2224,14 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) ret = UNKNOWN_ERROR; } } - LOGV("%s return ret = %d", __func__, ret); + ALOGV("%s return ret = %d", __func__, ret); return ret; } CameraParameters CameraHardwareSec::getParameters() const { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return mParameters; } @@ -2242,7 +2242,7 @@ status_t CameraHardwareSec::sendCommand(int32_t command, int32_t arg1, int32_t a void CameraHardwareSec::release() { - LOGV("%s", __func__); + ALOGV("%s", __func__); /* shut down any threads we have that might be running. do it here * instead of the destructor. we're guaranteed to be on another thread @@ -2346,7 +2346,7 @@ static inline CameraHardwareSec *obj(struct camera_device *dev) static int HAL_camera_device_set_preview_window(struct camera_device *dev, struct preview_stream_ops *buf) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->setPreviewWindow(buf); } @@ -2358,7 +2358,7 @@ static void HAL_camera_device_set_callbacks(struct camera_device *dev, camera_request_memory get_memory, void* user) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->setCallbacks(notify_cb, data_cb, data_cb_timestamp, get_memory, user); @@ -2374,7 +2374,7 @@ static void HAL_camera_device_set_callbacks(struct camera_device *dev, */ static void HAL_camera_device_enable_msg_type(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->enableMsgType(msg_type); } @@ -2390,7 +2390,7 @@ static void HAL_camera_device_enable_msg_type(struct camera_device *dev, int32_t */ static void HAL_camera_device_disable_msg_type(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->disableMsgType(msg_type); } @@ -2401,7 +2401,7 @@ static void HAL_camera_device_disable_msg_type(struct camera_device *dev, int32_ */ static int HAL_camera_device_msg_type_enabled(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->msgTypeEnabled(msg_type); } @@ -2410,7 +2410,7 @@ static int HAL_camera_device_msg_type_enabled(struct camera_device *dev, int32_t */ static int HAL_camera_device_start_preview(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->startPreview(); } @@ -2419,7 +2419,7 @@ static int HAL_camera_device_start_preview(struct camera_device *dev) */ static void HAL_camera_device_stop_preview(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->stopPreview(); } @@ -2428,7 +2428,7 @@ static void HAL_camera_device_stop_preview(struct camera_device *dev) */ static int HAL_camera_device_preview_enabled(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->previewEnabled(); } @@ -2464,7 +2464,7 @@ static int HAL_camera_device_preview_enabled(struct camera_device *dev) */ static int HAL_camera_device_store_meta_data_in_buffers(struct camera_device *dev, int enable) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->storeMetaDataInBuffers(enable); } @@ -2480,7 +2480,7 @@ static int HAL_camera_device_store_meta_data_in_buffers(struct camera_device *de */ static int HAL_camera_device_start_recording(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->startRecording(); } @@ -2489,7 +2489,7 @@ static int HAL_camera_device_start_recording(struct camera_device *dev) */ static void HAL_camera_device_stop_recording(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->stopRecording(); } @@ -2498,7 +2498,7 @@ static void HAL_camera_device_stop_recording(struct camera_device *dev) */ static int HAL_camera_device_recording_enabled(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->recordingEnabled(); } @@ -2514,7 +2514,7 @@ static int HAL_camera_device_recording_enabled(struct camera_device *dev) static void HAL_camera_device_release_recording_frame(struct camera_device *dev, const void *opaque) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->releaseRecordingFrame(opaque); } @@ -2525,7 +2525,7 @@ static void HAL_camera_device_release_recording_frame(struct camera_device *dev, */ static int HAL_camera_device_auto_focus(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->autoFocus(); } @@ -2537,7 +2537,7 @@ static int HAL_camera_device_auto_focus(struct camera_device *dev) */ static int HAL_camera_device_cancel_auto_focus(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->cancelAutoFocus(); } @@ -2546,7 +2546,7 @@ static int HAL_camera_device_cancel_auto_focus(struct camera_device *dev) */ static int HAL_camera_device_take_picture(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->takePicture(); } @@ -2556,7 +2556,7 @@ static int HAL_camera_device_take_picture(struct camera_device *dev) */ static int HAL_camera_device_cancel_picture(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->cancelPicture(); } @@ -2567,7 +2567,7 @@ static int HAL_camera_device_cancel_picture(struct camera_device *dev) static int HAL_camera_device_set_parameters(struct camera_device *dev, const char *parms) { - LOGV("%s", __func__); + ALOGV("%s", __func__); String8 str(parms); CameraParameters p(str); return obj(dev)->setParameters(p); @@ -2576,7 +2576,7 @@ static int HAL_camera_device_set_parameters(struct camera_device *dev, /** Return the camera parameters. */ char *HAL_camera_device_get_parameters(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); String8 str; CameraParameters parms = obj(dev)->getParameters(); str = parms.flatten(); @@ -2585,7 +2585,7 @@ char *HAL_camera_device_get_parameters(struct camera_device *dev) void HAL_camera_device_put_parameters(struct camera_device *dev, char *parms) { - LOGV("%s", __func__); + ALOGV("%s", __func__); free(parms); } @@ -2595,7 +2595,7 @@ void HAL_camera_device_put_parameters(struct camera_device *dev, char *parms) static int HAL_camera_device_send_command(struct camera_device *dev, int32_t cmd, int32_t arg1, int32_t arg2) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->sendCommand(cmd, arg1, arg2); } @@ -2605,7 +2605,7 @@ static int HAL_camera_device_send_command(struct camera_device *dev, */ static void HAL_camera_device_release(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->release(); } @@ -2614,19 +2614,19 @@ static void HAL_camera_device_release(struct camera_device *dev) */ static int HAL_camera_device_dump(struct camera_device *dev, int fd) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->dump(fd); } static int HAL_getNumberOfCameras() { - LOGV("%s", __func__); + ALOGV("%s", __func__); return sizeof(sCameraInfo) / sizeof(sCameraInfo[0]); } static int HAL_getCameraInfo(int cameraId, struct camera_info *cameraInfo) { - LOGV("%s", __func__); + ALOGV("%s", __func__); memcpy(cameraInfo, &sCameraInfo[cameraId], sizeof(CameraInfo)); return 0; } @@ -2665,7 +2665,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, const char *id, struct hw_device_t** device) { - LOGV("%s", __func__); + ALOGV("%s", __func__); int cameraId = atoi(id); if (cameraId < 0 || cameraId >= HAL_getNumberOfCameras()) { @@ -2675,7 +2675,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, if (g_cam_device) { if (obj(g_cam_device)->getCameraId() == cameraId) { - LOGV("returning existing camera ID %s", id); + ALOGV("returning existing camera ID %s", id); goto done; } else { LOGE("Cannot open camera %d. camera %d is already running!", -- cgit v1.1