diff options
Diffstat (limited to 'libcamera/SecCameraHWInterface.cpp')
| -rwxr-xr-x | libcamera/SecCameraHWInterface.cpp | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 0efd85d..40ba50d 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -103,12 +103,12 @@ CameraHardwareSec::CameraHardwareSec(int cameraId, camera_device_t *dev) if (!mGrallocHal) { ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **)&mGrallocHal); if (ret) - LOGE("ERR(%s):Fail on loading gralloc HAL", __func__); + ALOGE("ERR(%s):Fail on loading gralloc HAL", __func__); } ret = mSecCamera->initCamera(cameraId); if (ret < 0) { - LOGE("ERR(%s):Fail on mSecCamera init", __func__); + ALOGE("ERR(%s):Fail on mSecCamera init", __func__); } mSecCamera->getPostViewConfig(&mPostViewWidth, &mPostViewHeight, &mPostViewSize); @@ -137,7 +137,7 @@ int CameraHardwareSec::getCameraId() const void CameraHardwareSec::initDefaultParameters(int cameraId) { if (mSecCamera == NULL) { - LOGE("ERR(%s):mSecCamera object is NULL", __func__); + ALOGE("ERR(%s):mSecCamera object is NULL", __func__); return; } @@ -170,11 +170,11 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) // sizes at zero to catch the error. if (mSecCamera->getPreviewMaxSize(&preview_max_width, &preview_max_height) < 0) - LOGE("getPreviewMaxSize fail (%d / %d) \n", + ALOGE("getPreviewMaxSize fail (%d / %d) \n", preview_max_width, preview_max_height); if (mSecCamera->getSnapshotMaxSize(&snapshot_max_width, &snapshot_max_height) < 0) - LOGE("getSnapshotMaxSize fail (%d / %d) \n", + ALOGE("getSnapshotMaxSize fail (%d / %d) \n", snapshot_max_width, snapshot_max_height); String8 previewColorString; previewColorString = CameraParameters::PIXEL_FORMAT_YUV420SP; @@ -369,7 +369,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) ALOGV("%s: mPreviewWindow %p", __func__, mPreviewWindow); if (!w) { - LOGE("preview window is NULL!"); + ALOGE("preview window is NULL!"); return OK; } @@ -381,18 +381,18 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) } if (w->get_min_undequeued_buffer_count(w, &min_bufs)) { - LOGE("%s: could not retrieve min undequeued buffer count", __func__); + ALOGE("%s: could not retrieve min undequeued buffer count", __func__); return INVALID_OPERATION; } if (min_bufs >= kBufferCount) { - LOGE("%s: min undequeued buffer count %d is too high (expecting at most %d)", __func__, + ALOGE("%s: min undequeued buffer count %d is too high (expecting at most %d)", __func__, min_bufs, kBufferCount - 1); } ALOGV("%s: setting buffer count to %d", __func__, kBufferCount); if (w->set_buffer_count(w, kBufferCount)) { - LOGE("%s: could not set buffer count", __func__); + ALOGE("%s: could not set buffer count", __func__); return INVALID_OPERATION; } @@ -405,14 +405,14 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) ALOGV("%s: preview format %s", __func__, str_preview_format); if (w->set_usage(w, GRALLOC_USAGE_SW_WRITE_OFTEN)) { - LOGE("%s: could not set usage on gralloc buffer", __func__); + ALOGE("%s: could not set usage on gralloc buffer", __func__); return INVALID_OPERATION; } if (w->set_buffers_geometry(w, preview_width, preview_height, hal_pixel_format)) { - LOGE("%s: could not set buffers geometry to %s", + ALOGE("%s: could not set buffers geometry to %s", __func__, str_preview_format); return INVALID_OPERATION; } @@ -509,7 +509,7 @@ int CameraHardwareSec::previewThread() index = mSecCamera->getPreview(); if (index < 0) { - LOGE("ERR(%s):Fail on SecCamera->getPreview()", __func__); + ALOGE("ERR(%s):Fail on SecCamera->getPreview()", __func__); return UNKNOWN_ERROR; } @@ -530,7 +530,7 @@ int CameraHardwareSec::previewThread() phyCAddr = mSecCamera->getPhyAddrC(index); if (phyYAddr == 0xffffffff || phyCAddr == 0xffffffff) { - LOGE("ERR(%s):Fail on SecCamera getPhyAddr Y addr = %0x C addr = %0x", + ALOGE("ERR(%s):Fail on SecCamera getPhyAddr Y addr = %0x C addr = %0x", __func__, phyYAddr, phyCAddr); return UNKNOWN_ERROR; } @@ -545,7 +545,7 @@ int CameraHardwareSec::previewThread() buffer_handle_t *buf_handle; int stride; if (0 != mPreviewWindow->dequeue_buffer(mPreviewWindow, &buf_handle, &stride)) { - LOGE("Could not dequeue gralloc buffer!\n"); + ALOGE("Could not dequeue gralloc buffer!\n"); goto callbacks; } @@ -591,10 +591,10 @@ int CameraHardwareSec::previewThread() mGrallocHal->unlock(mGrallocHal, *buf_handle); } else - LOGE("%s: could not obtain gralloc buffer", __func__); + ALOGE("%s: could not obtain gralloc buffer", __func__); if (0 != mPreviewWindow->enqueue_buffer(mPreviewWindow, buf_handle)) { - LOGE("Could not enqueue gralloc buffer!\n"); + ALOGE("Could not enqueue gralloc buffer!\n"); goto callbacks; } } @@ -626,7 +626,7 @@ callbacks: if (mRecordRunning == true) { index = mSecCamera->getRecordFrame(); if (index < 0) { - LOGE("ERR(%s):Fail on SecCamera->getRecord()", __func__); + ALOGE("ERR(%s):Fail on SecCamera->getRecord()", __func__); return UNKNOWN_ERROR; } @@ -634,7 +634,7 @@ callbacks: phyCAddr = mSecCamera->getRecPhyAddrC(index); if (phyYAddr == 0xffffffff || phyCAddr == 0xffffffff) { - LOGE("ERR(%s):Fail on SecCamera getRectPhyAddr Y addr = %0x C addr = %0x", __func__, + ALOGE("ERR(%s):Fail on SecCamera getRectPhyAddr Y addr = %0x C addr = %0x", __func__, phyYAddr, phyCAddr); return UNKNOWN_ERROR; } @@ -671,7 +671,7 @@ status_t CameraHardwareSec::startPreview() mPreviewLock.lock(); if (mPreviewRunning) { // already running - LOGE("%s : preview thread already running", __func__); + ALOGE("%s : preview thread already running", __func__); mPreviewLock.unlock(); return INVALID_OPERATION; } @@ -702,7 +702,7 @@ status_t CameraHardwareSec::startPreviewInternal() ALOGV("%s : mSecCamera->startPreview() returned %d", __func__, ret); if (ret < 0) { - LOGE("ERR(%s):Fail on mSecCamera->startPreview()", __func__); + ALOGE("ERR(%s):Fail on mSecCamera->startPreview()", __func__); return UNKNOWN_ERROR; } @@ -780,13 +780,13 @@ status_t CameraHardwareSec::startRecording() } mRecordHeap = mGetMemoryCb(-1, sizeof(struct addrs), kBufferCount, NULL); if (!mRecordHeap) { - LOGE("ERR(%s): Record heap creation fail", __func__); + ALOGE("ERR(%s): Record heap creation fail", __func__); return UNKNOWN_ERROR; } if (mRecordRunning == false) { if (mSecCamera->startRecord() < 0) { - LOGE("ERR(%s):Fail on mSecCamera->startRecord()", __func__); + ALOGE("ERR(%s):Fail on mSecCamera->startRecord()", __func__); return UNKNOWN_ERROR; } mRecordRunning = true; @@ -802,7 +802,7 @@ void CameraHardwareSec::stopRecording() if (mRecordRunning == true) { if (mSecCamera->stopRecord() < 0) { - LOGE("ERR(%s):Fail on mSecCamera->stopRecord()", __func__); + ALOGE("ERR(%s):Fail on mSecCamera->stopRecord()", __func__); return; } mRecordRunning = false; @@ -855,7 +855,7 @@ int CameraHardwareSec::autoFocusThread() ALOGV("%s : calling setAutoFocus", __func__); if (mSecCamera->setAutofocus() < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setAutofocus()", __func__); + ALOGE("ERR(%s):Fail on mSecCamera->setAutofocus()", __func__); return UNKNOWN_ERROR; } @@ -904,7 +904,7 @@ status_t CameraHardwareSec::cancelAutoFocus() if (mPreviewRunning && mPreviewStartDeferred) return NO_ERROR; if (mSecCamera->cancelAutofocus() < 0) { - LOGE("ERR(%s):Fail on mSecCamera->cancelAutofocus()", __func__); + ALOGE("ERR(%s):Fail on mSecCamera->cancelAutofocus()", __func__); return UNKNOWN_ERROR; } @@ -919,14 +919,14 @@ int CameraHardwareSec::save_jpeg( unsigned char *real_jpeg, int jpeg_size) /* file create/open, note to "wb" */ yuv_fp = fopen("/data/camera_dump.jpeg", "wb"); if (yuv_fp == NULL) { - LOGE("Save jpeg file open error"); + ALOGE("Save jpeg file open error"); return -1; } ALOGV("[BestIQ] real_jpeg size ========> %d\n", jpeg_size); buffer = (char *) malloc(jpeg_size); if (buffer == NULL) { - LOGE("Save YUV] buffer alloc failed"); + ALOGE("Save YUV] buffer alloc failed"); if (yuv_fp) fclose(yuv_fp); @@ -958,7 +958,7 @@ void CameraHardwareSec::save_postview(const char *fname, uint8_t *buf, uint32_t ALOGD("opening file [%s]\n", fname); int fd = open(fname, O_RDWR | O_CREAT); if (fd < 0) { - LOGE("failed to create file [%s]: %s", fname, strerror(errno)); + ALOGE("failed to create file [%s]: %s", fname, strerror(errno)); return; } @@ -966,7 +966,7 @@ void CameraHardwareSec::save_postview(const char *fname, uint8_t *buf, uint32_t while (written < size) { nw = ::write(fd, buf + written, size - written); if (nw < 0) { - LOGE("failed to write to file %d [%s]: %s",written,fname, strerror(errno)); + ALOGE("failed to write to file %d [%s]: %s",written,fname, strerror(errno)); break; } written += nw; @@ -984,7 +984,7 @@ bool CameraHardwareSec::scaleDownYuv422(char *srcBuf, uint32_t srcWidth, uint32_ int32_t x, y, src_y_start_pos, dst_pos, src_pos; if (dstWidth % 2 != 0 || dstHeight % 2 != 0){ - LOGE("scale_down_yuv422: invalid width, height for scaling"); + ALOGE("scale_down_yuv422: invalid width, height for scaling"); return false; } @@ -1101,7 +1101,7 @@ int CameraHardwareSec::pictureThread() if (mSecCamera->getCameraId() == SecCamera::CAMERA_ID_BACK){ jpeg_data = mSecCamera->getJpeg(&jpeg_size, &phyAddr); if (jpeg_data == NULL) { - LOGE("ERR(%s):Fail on SecCamera->getSnapshot()", __func__); + ALOGE("ERR(%s):Fail on SecCamera->getSnapshot()", __func__); ret = UNKNOWN_ERROR; goto out; } @@ -1198,7 +1198,7 @@ status_t CameraHardwareSec::waitCaptureCompletion() { while (mCaptureInProgress) { nsecs_t remainingTime = endTime - systemTime(SYSTEM_TIME_MONOTONIC); if (remainingTime <= 0) { - LOGE("Timed out waiting picture thread."); + ALOGE("Timed out waiting picture thread."); return TIMED_OUT; } ALOGD("Waiting for picture thread to complete."); @@ -1218,7 +1218,7 @@ status_t CameraHardwareSec::takePicture() ALOGV("mRawHeap : MemoryHeapBase(previewHeapSize(%d))", rawHeapSize); mRawHeap = mGetMemoryCb(-1, rawHeapSize, 1, 0); if (!mRawHeap) { - LOGE("ERR(%s): Raw heap creation fail", __func__); + ALOGE("ERR(%s): Raw heap creation fail", __func__); } } @@ -1227,7 +1227,7 @@ status_t CameraHardwareSec::takePicture() } if (mPictureThread->run("CameraPictureThread", PRIORITY_DEFAULT) != NO_ERROR) { - LOGE("%s : couldn't run picture thread", __func__); + ALOGE("%s : couldn't run picture thread", __func__); return INVALID_OPERATION; } mCaptureLock.lock(); @@ -1253,7 +1253,7 @@ status_t CameraHardwareSec::cancelPicture() bool CameraHardwareSec::CheckVideoStartMarker(unsigned char *pBuf) { if (!pBuf) { - LOGE("CheckVideoStartMarker() => pBuf is NULL\n"); + ALOGE("CheckVideoStartMarker() => pBuf is NULL\n"); return false; } @@ -1267,7 +1267,7 @@ bool CameraHardwareSec::CheckVideoStartMarker(unsigned char *pBuf) bool CameraHardwareSec::CheckEOIMarker(unsigned char *pBuf) { if (!pBuf) { - LOGE("CheckEOIMarker() => pBuf is NULL\n"); + ALOGE("CheckEOIMarker() => pBuf is NULL\n"); return false; } @@ -1281,7 +1281,7 @@ bool CameraHardwareSec::CheckEOIMarker(unsigned char *pBuf) bool CameraHardwareSec::FindEOIMarkerInJPEG(unsigned char *pBuf, int dwBufSize, int *pnJPEGsize) { if (NULL == pBuf || 0 >= dwBufSize) { - LOGE("FindEOIMarkerInJPEG() => There is no contents."); + ALOGE("FindEOIMarkerInJPEG() => There is no contents."); return false; } @@ -1305,12 +1305,12 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, ALOGV("===========SplitFrame Start=============="); if (NULL == pFrame || 0 >= dwSize) { - LOGE("There is no contents (pFrame=%p, dwSize=%d", pFrame, dwSize); + ALOGE("There is no contents (pFrame=%p, dwSize=%d", pFrame, dwSize); return false; } if (0 == dwJPEGLineLength || 0 == dwVideoLineLength) { - LOGE("There in no input information for decoding interleaved jpeg"); + ALOGE("There in no input information for decoding interleaved jpeg"); return false; } @@ -1379,7 +1379,7 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, if(pdwVideoSize) *pdwVideoSize = dwVSize; } else { - LOGE("DecodeInterleaveJPEG_WithOutDT() => Can not find EOI"); + ALOGE("DecodeInterleaveJPEG_WithOutDT() => Can not find EOI"); bRet = false; if(pdwJPEGSize) *pdwJPEGSize = 0; @@ -1417,13 +1417,13 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, if ((*interleave_ptr == 0xFFFFFFFF) || (*interleave_ptr == 0x02FFFFFF) || (*interleave_ptr == 0xFF02FFFF)) { // Padding Data -// LOGE("%d(%x) padding data\n", i, *interleave_ptr); +// ALOGE("%d(%x) padding data\n", i, *interleave_ptr); interleave_ptr++; i += 4; } else if ((*interleave_ptr & 0xFFFF) == 0x05FF) { // Start-code of YUV Data -// LOGE("%d(%x) yuv data\n", i, *interleave_ptr); +// ALOGE("%d(%x) yuv data\n", i, *interleave_ptr); p = (unsigned char *)interleave_ptr; p += 2; i += 2; @@ -1447,7 +1447,7 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, } } else { // Extract JPEG Data -// LOGE("%d(%x) jpg data, jpeg_size = %d bytes\n", i, *interleave_ptr, jpeg_size); +// ALOGE("%d(%x) jpg data, jpeg_size = %d bytes\n", i, *interleave_ptr, jpeg_size); if (pJpegData != NULL) { memcpy(jpeg_ptr, interleave_ptr, 4); jpeg_ptr += 4; @@ -1564,7 +1564,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (strcmp(new_str_preview_format, CameraParameters::PIXEL_FORMAT_YUV420SP) && strcmp(new_str_preview_format, CameraParameters::PIXEL_FORMAT_YUV420P)) { - LOGE("Unsupported preview color format: %s", new_str_preview_format); + ALOGE("Unsupported preview color format: %s", new_str_preview_format); return BAD_VALUE; } @@ -1584,13 +1584,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) current_pixel_format != new_preview_format) { if (mSecCamera->setPreviewSize(new_preview_width, new_preview_height, new_preview_format) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setPreviewSize(width(%d), height(%d), format(%d))", + ALOGE("ERR(%s):Fail on mSecCamera->setPreviewSize(width(%d), height(%d), format(%d))", __func__, new_preview_width, new_preview_height, new_preview_format); ret = UNKNOWN_ERROR; } else { if (mPreviewWindow) { if (mPreviewRunning && !mPreviewStartDeferred) { - LOGE("ERR(%s): preview is running, cannot change size and format!", + ALOGE("ERR(%s): preview is running, cannot change size and format!", __func__); ret = INVALID_OPERATION; } @@ -1610,7 +1610,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) } else ALOGV("%s: preview size and format has not changed", __func__); } else { - LOGE("%s: Invalid preview size(%dx%d)", + ALOGE("%s: Invalid preview size(%dx%d)", __func__, new_preview_width, new_preview_height); ret = INVALID_OPERATION; @@ -1624,7 +1624,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 < new_picture_width && 0 < new_picture_height) { 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))", + ALOGE("ERR(%s):Fail on mSecCamera->setSnapshotSize(width(%d), height(%d))", __func__, new_picture_width, new_picture_height); ret = UNKNOWN_ERROR; } else { @@ -1662,7 +1662,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) new_picture_format = V4L2_PIX_FMT_NV21; //for 3rd party if (mSecCamera->setSnapshotPixelFormat(new_picture_format) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setSnapshotPixelFormat(format(%d))", __func__, new_picture_format); + ALOGE("ERR(%s):Fail on mSecCamera->setSnapshotPixelFormat(format(%d))", __func__, new_picture_format); ret = UNKNOWN_ERROR; } else { mParameters.setPictureFormat(new_str_picture_format); @@ -1675,7 +1675,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) /* we ignore bad values */ if (new_jpeg_quality >=1 && new_jpeg_quality <= 100) { if (mSecCamera->setJpegQuality(new_jpeg_quality) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setJpegQuality(quality(%d))", __func__, new_jpeg_quality); + ALOGE("ERR(%s):Fail on mSecCamera->setJpegQuality(quality(%d))", __func__, new_jpeg_quality); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_JPEG_QUALITY, new_jpeg_quality); @@ -1687,7 +1687,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_jpeg_thumbnail_height= params.getInt(CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT); if (0 <= new_jpeg_thumbnail_width && 0 <= new_jpeg_thumbnail_height) { if (mSecCamera->setJpegThumbnailSize(new_jpeg_thumbnail_width, new_jpeg_thumbnail_height) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setJpegThumbnailSize(width(%d), height(%d))", __func__, new_jpeg_thumbnail_width, new_jpeg_thumbnail_height); + ALOGE("ERR(%s):Fail on mSecCamera->setJpegThumbnailSize(width(%d), height(%d))", __func__, new_jpeg_thumbnail_width, new_jpeg_thumbnail_height); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH, new_jpeg_thumbnail_width); @@ -1711,7 +1711,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= 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); + ALOGE("ERR(%s):Fail on mSecCamera->setExifOrientationInfo(%d)", __func__, new_rotation); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_ROTATION, new_rotation); @@ -1726,7 +1726,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if ((min_exposure_compensation <= new_exposure_compensation) && (max_exposure_compensation >= new_exposure_compensation)) { if (mSecCamera->setBrightness(new_exposure_compensation) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setBrightness(brightness(%d))", __func__, new_exposure_compensation); + ALOGE("ERR(%s):Fail on mSecCamera->setBrightness(brightness(%d))", __func__, new_exposure_compensation); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_EXPOSURE_COMPENSATION, new_exposure_compensation); @@ -1754,13 +1754,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) CameraParameters::WHITE_BALANCE_INCANDESCENT)) new_white = WHITE_BALANCE_TUNGSTEN; else { - LOGE("ERR(%s):Invalid white balance(%s)", __func__, new_white_str); //twilight, shade, warm_flourescent + ALOGE("ERR(%s):Invalid white balance(%s)", __func__, new_white_str); //twilight, shade, warm_flourescent ret = UNKNOWN_ERROR; } if (0 <= new_white) { if (mSecCamera->setWhiteBalance(new_white) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setWhiteBalance(white(%d))", __func__, new_white); + ALOGE("ERR(%s):Fail on mSecCamera->setWhiteBalance(white(%d))", __func__, new_white); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_WHITE_BALANCE, new_white_str); @@ -1787,7 +1787,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if ((new_min_fps != current_min_fps) || (new_max_fps != current_max_fps)) { ALOGW("%s : requested new_min_fps = %d, new_max_fps = %d not allowed", __func__, new_min_fps, new_max_fps); - LOGE("%s : current_min_fps = %d, current_max_fps = %d", + ALOGE("%s : current_min_fps = %d, current_max_fps = %d", __func__, current_min_fps, current_max_fps); ret = UNKNOWN_ERROR; } @@ -1872,7 +1872,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) new_flash_mode_str = CameraParameters::FLASH_MODE_OFF; mParameters.set(CameraParameters::KEY_SUPPORTED_FLASH_MODES, "off"); } else { - LOGE("%s::unmatched scene_mode(%s)", + ALOGE("%s::unmatched scene_mode(%s)", __func__, new_scene_mode_str); //action, night-portrait, theatre, steadyphoto ret = UNKNOWN_ERROR; } @@ -1901,13 +1901,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) BACK_CAMERA_INFINITY_FOCUS_DISTANCES_STR); } else { - LOGE("%s::unmatched focus_mode(%s)", __func__, new_focus_mode_str); + ALOGE("%s::unmatched focus_mode(%s)", __func__, new_focus_mode_str); ret = UNKNOWN_ERROR; } if (0 <= new_focus_mode) { if (mSecCamera->setFocusMode(new_focus_mode) < 0) { - LOGE("%s::mSecCamera->setFocusMode(%d) fail", __func__, new_focus_mode); + ALOGE("%s::mSecCamera->setFocusMode(%d) fail", __func__, new_focus_mode); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_FOCUS_MODE, new_focus_mode_str); @@ -1928,12 +1928,12 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) else if (!strcmp(new_flash_mode_str, CameraParameters::FLASH_MODE_TORCH)) new_flash_mode = FLASH_MODE_TORCH; else { - LOGE("%s::unmatched flash_mode(%s)", __func__, new_flash_mode_str); //red-eye + ALOGE("%s::unmatched flash_mode(%s)", __func__, new_flash_mode_str); //red-eye ret = UNKNOWN_ERROR; } if (0 <= new_flash_mode) { if (mSecCamera->setFlashMode(new_flash_mode) < 0) { - LOGE("%s::mSecCamera->setFlashMode(%d) fail", __func__, new_flash_mode); + ALOGE("%s::mSecCamera->setFlashMode(%d) fail", __func__, new_flash_mode); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_FLASH_MODE, new_flash_mode_str); @@ -1944,7 +1944,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // scene.. if (0 <= new_scene_mode) { if (mSecCamera->setSceneMode(new_scene_mode) < 0) { - LOGE("%s::mSecCamera->setSceneMode(%d) fail", __func__, new_scene_mode); + ALOGE("%s::mSecCamera->setSceneMode(%d) fail", __func__, new_scene_mode); ret = UNKNOWN_ERROR; } else { mParameters.set(CameraParameters::KEY_SCENE_MODE, new_scene_mode_str); @@ -1953,7 +1953,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) } else { if (!isSupportedParameter(new_focus_mode_str, mParameters.get(CameraParameters::KEY_SUPPORTED_FOCUS_MODES))) { - LOGE("%s: Unsupported focus mode: %s", __func__, new_focus_mode_str); + ALOGE("%s: Unsupported focus mode: %s", __func__, new_focus_mode_str); ret = UNKNOWN_ERROR; } } @@ -1978,13 +1978,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) new_image_effect = IMAGE_EFFECT_NEGATIVE; else { //posterize, whiteboard, blackboard, solarize - LOGE("ERR(%s):Invalid effect(%s)", __func__, new_image_effect_str); + ALOGE("ERR(%s):Invalid effect(%s)", __func__, new_image_effect_str); ret = UNKNOWN_ERROR; } if (new_image_effect >= 0) { if (mSecCamera->setImageEffect(new_image_effect) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setImageEffect(effect(%d))", __func__, new_image_effect); + ALOGE("ERR(%s):Fail on mSecCamera->setImageEffect(effect(%d))", __func__, new_image_effect); ret = UNKNOWN_ERROR; } else { const char *old_image_effect_str = mParameters.get(CameraParameters::KEY_EFFECT); @@ -2004,7 +2004,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_vtmode = mInternalParameters.getInt("vtmode"); if (0 <= new_vtmode) { if (mSecCamera->setVTmode(new_vtmode) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setVTMode(%d)", __func__, new_vtmode); + ALOGE("ERR(%s):Fail on mSecCamera->setVTMode(%d)", __func__, new_vtmode); ret = UNKNOWN_ERROR; } } @@ -2014,7 +2014,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_contrast) { if (mSecCamera->setContrast(new_contrast) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setContrast(%d)", __func__, new_contrast); + ALOGE("ERR(%s):Fail on mSecCamera->setContrast(%d)", __func__, new_contrast); ret = UNKNOWN_ERROR; } } @@ -2024,7 +2024,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_wdr) { if (mSecCamera->setWDR(new_wdr) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setWDR(%d)", __func__, new_wdr); + ALOGE("ERR(%s):Fail on mSecCamera->setWDR(%d)", __func__, new_wdr); ret = UNKNOWN_ERROR; } } @@ -2034,7 +2034,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_anti_shake) { if (mSecCamera->setAntiShake(new_anti_shake) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setWDR(%d)", __func__, new_anti_shake); + ALOGE("ERR(%s):Fail on mSecCamera->setWDR(%d)", __func__, new_anti_shake); ret = UNKNOWN_ERROR; } } @@ -2042,7 +2042,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // gps latitude const char *new_gps_latitude_str = params.get(CameraParameters::KEY_GPS_LATITUDE); if (mSecCamera->setGPSLatitude(new_gps_latitude_str) < 0) { - LOGE("%s::mSecCamera->setGPSLatitude(%s) fail", __func__, new_gps_latitude_str); + ALOGE("%s::mSecCamera->setGPSLatitude(%s) fail", __func__, new_gps_latitude_str); ret = UNKNOWN_ERROR; } else { if (new_gps_latitude_str) { @@ -2056,7 +2056,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) const char *new_gps_longitude_str = params.get(CameraParameters::KEY_GPS_LONGITUDE); if (mSecCamera->setGPSLongitude(new_gps_longitude_str) < 0) { - LOGE("%s::mSecCamera->setGPSLongitude(%s) fail", __func__, new_gps_longitude_str); + ALOGE("%s::mSecCamera->setGPSLongitude(%s) fail", __func__, new_gps_longitude_str); ret = UNKNOWN_ERROR; } else { if (new_gps_longitude_str) { @@ -2070,7 +2070,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) const char *new_gps_altitude_str = params.get(CameraParameters::KEY_GPS_ALTITUDE); if (mSecCamera->setGPSAltitude(new_gps_altitude_str) < 0) { - LOGE("%s::mSecCamera->setGPSAltitude(%s) fail", __func__, new_gps_altitude_str); + ALOGE("%s::mSecCamera->setGPSAltitude(%s) fail", __func__, new_gps_altitude_str); ret = UNKNOWN_ERROR; } else { if (new_gps_altitude_str) { @@ -2084,7 +2084,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) const char *new_gps_timestamp_str = params.get(CameraParameters::KEY_GPS_TIMESTAMP); if (mSecCamera->setGPSTimeStamp(new_gps_timestamp_str) < 0) { - LOGE("%s::mSecCamera->setGPSTimeStamp(%s) fail", __func__, new_gps_timestamp_str); + ALOGE("%s::mSecCamera->setGPSTimeStamp(%s) fail", __func__, new_gps_timestamp_str); ret = UNKNOWN_ERROR; } else { if (new_gps_timestamp_str) { @@ -2098,7 +2098,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) const char *new_gps_processing_method_str = params.get(CameraParameters::KEY_GPS_PROCESSING_METHOD); if (mSecCamera->setGPSProcessingMethod(new_gps_processing_method_str) < 0) { - LOGE("%s::mSecCamera->setGPSProcessingMethod(%s) fail", __func__, new_gps_processing_method_str); + ALOGE("%s::mSecCamera->setGPSProcessingMethod(%s) fail", __func__, new_gps_processing_method_str); ret = UNKNOWN_ERROR; } else { if (new_gps_processing_method_str) { @@ -2114,12 +2114,12 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 < new_recording_width && 0 < new_recording_height) { if (mSecCamera->setRecordingSize(new_recording_width, new_recording_height) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setRecordingSize(width(%d), height(%d))", __func__, new_recording_width, new_recording_height); + ALOGE("ERR(%s):Fail on mSecCamera->setRecordingSize(width(%d), height(%d))", __func__, new_recording_width, new_recording_height); ret = UNKNOWN_ERROR; } } else { if (mSecCamera->setRecordingSize(new_preview_width, new_preview_height) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setRecordingSize(width(%d), height(%d))", __func__, new_preview_width, new_preview_height); + ALOGE("ERR(%s):Fail on mSecCamera->setRecordingSize(width(%d), height(%d))", __func__, new_preview_width, new_preview_height); ret = UNKNOWN_ERROR; } } @@ -2134,13 +2134,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) else if (!strcmp(new_gamma_str, "on")) new_gamma = GAMMA_ON; else { - LOGE("%s::unmatched gamma(%s)", __func__, new_gamma_str); + ALOGE("%s::unmatched gamma(%s)", __func__, new_gamma_str); ret = UNKNOWN_ERROR; } if (0 <= new_gamma) { if (mSecCamera->setGamma(new_gamma) < 0) { - LOGE("%s::mSecCamera->setGamma(%d) fail", __func__, new_gamma); + ALOGE("%s::mSecCamera->setGamma(%d) fail", __func__, new_gamma); ret = UNKNOWN_ERROR; } } @@ -2157,13 +2157,13 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) else if (!strcmp(new_slow_ae_str, "on")) new_slow_ae = SLOW_AE_ON; else { - LOGE("%s::unmatched slow_ae(%s)", __func__, new_slow_ae_str); + ALOGE("%s::unmatched slow_ae(%s)", __func__, new_slow_ae_str); ret = UNKNOWN_ERROR; } if (0 <= new_slow_ae) { if (mSecCamera->setSlowAE(new_slow_ae) < 0) { - LOGE("%s::mSecCamera->setSlowAE(%d) fail", __func__, new_slow_ae); + ALOGE("%s::mSecCamera->setSlowAE(%d) fail", __func__, new_slow_ae); ret = UNKNOWN_ERROR; } } @@ -2174,7 +2174,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_sensor_mode) { if (mSecCamera->setSensorMode(new_sensor_mode) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setSensorMode(%d)", __func__, new_sensor_mode); + ALOGE("ERR(%s):Fail on mSecCamera->setSensorMode(%d)", __func__, new_sensor_mode); ret = UNKNOWN_ERROR; } } else { @@ -2186,7 +2186,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_shot_mode) { if (mSecCamera->setShotMode(new_shot_mode) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setShotMode(%d)", __func__, new_shot_mode); + ALOGE("ERR(%s):Fail on mSecCamera->setShotMode(%d)", __func__, new_shot_mode); ret = UNKNOWN_ERROR; } } else { @@ -2198,7 +2198,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_blur_level) { if (mSecCamera->setBlur(new_blur_level) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setBlur(%d)", __func__, new_blur_level); + ALOGE("ERR(%s):Fail on mSecCamera->setBlur(%d)", __func__, new_blur_level); ret = UNKNOWN_ERROR; } } @@ -2209,7 +2209,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (0 <= new_dataline) { if (mSecCamera->setDataLineCheck(new_dataline) < 0) { - LOGE("ERR(%s):Fail on mSecCamera->setDataLineCheck(%d)", __func__, new_dataline); + ALOGE("ERR(%s):Fail on mSecCamera->setDataLineCheck(%d)", __func__, new_dataline); ret = UNKNOWN_ERROR; } } @@ -2293,7 +2293,7 @@ status_t CameraHardwareSec::storeMetaDataInBuffers(bool enable) // metadata buffer mode can be turned on or off. // Samsung needs to fix this. if (!enable) { - LOGE("Non-metadata buffer mode is not supported!"); + ALOGE("Non-metadata buffer mode is not supported!"); return INVALID_OPERATION; } return OK; @@ -2658,7 +2658,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, int cameraId = atoi(id); if (cameraId < 0 || cameraId >= HAL_getNumberOfCameras()) { - LOGE("Invalid camera ID %s", id); + ALOGE("Invalid camera ID %s", id); return -EINVAL; } @@ -2667,7 +2667,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, ALOGV("returning existing camera ID %s", id); goto done; } else { - LOGE("Cannot open camera %d. camera %d is already running!", + ALOGE("Cannot open camera %d. camera %d is already running!", cameraId, obj(g_cam_device)->getCameraId()); return -ENOSYS; } |