From 0edef6238dcdaf1502811da188886ded4d2b4319 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Jan 2012 20:07:50 +0000 Subject: Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I61ce15c87baa38e1f88857e30b549d513a54b724 --- libcamera/SecCamera.cpp | 24 ++++++++++---------- libcamera/SecCameraHWInterface.cpp | 26 +++++++++++----------- libhwcomposer/SecHWC.cpp | 2 +- .../video/mfc_c110/dec/src/SsbSipMfcDecAPI.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 12f21a8..cdf71ae 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -209,7 +209,7 @@ static const __u8* fimc_v4l2_enuminput(int fp, int index) LOGE("ERR(%s):No matching index found\n", __func__); return NULL; } - LOGI("Name of input channel[%d] is %s\n", input.index, input.name); + ALOGI("Name of input channel[%d] is %s\n", input.index, input.name); return input.name; } @@ -343,7 +343,7 @@ static int fimc_v4l2_querybuf(int fp, struct fimc_buffer *buffer, enum v4l2_buf_ struct v4l2_buffer v4l2_buf; int ret; - LOGI("%s :", __func__); + ALOGI("%s :", __func__); v4l2_buf.type = type; v4l2_buf.memory = V4L2_MEMORY_MMAP; @@ -363,7 +363,7 @@ static int fimc_v4l2_querybuf(int fp, struct fimc_buffer *buffer, enum v4l2_buf_ return -1; } - LOGI("%s: buffer->start = %p v4l2_buf.length = %d", + ALOGI("%s: buffer->start = %p v4l2_buf.length = %d", __func__, buffer->start, v4l2_buf.length); return 0; @@ -665,7 +665,7 @@ int SecCamera::initCamera(int index) setExifFixedAttribute(); m_flag_init = 1; - LOGI("%s : initialized", __FUNCTION__); + ALOGI("%s : initialized", __FUNCTION__); } return 0; } @@ -688,13 +688,13 @@ void SecCamera::DeinitCamera() /* close m_cam_fd after stopRecord() because stopRecord() * uses m_cam_fd to change frame rate */ - LOGI("DeinitCamera: m_cam_fd(%d)", m_cam_fd); + ALOGI("DeinitCamera: m_cam_fd(%d)", m_cam_fd); if (m_cam_fd > -1) { close(m_cam_fd); m_cam_fd = -1; } - LOGI("DeinitCamera: m_cam_fd2(%d)", m_cam_fd2); + ALOGI("DeinitCamera: m_cam_fd2(%d)", m_cam_fd2); if (m_cam_fd2 > -1) { close(m_cam_fd2); m_cam_fd2 = -1; @@ -702,7 +702,7 @@ void SecCamera::DeinitCamera() m_flag_init = 0; } - else LOGI("%s : already deinitialized", __FUNCTION__); + else ALOGI("%s : already deinitialized", __FUNCTION__); } @@ -840,7 +840,7 @@ int SecCamera::startRecord(void) ret = fimc_v4l2_enum_fmt(m_cam_fd2, V4L2_PIX_FMT_NV12T); CHECK(ret); - LOGI("%s: m_recording_width = %d, m_recording_height = %d\n", + ALOGI("%s: m_recording_width = %d, m_recording_height = %d\n", __func__, m_recording_width, m_recording_height); ret = fimc_v4l2_s_fmt(m_cam_fd2, m_recording_width, @@ -1005,7 +1005,7 @@ int SecCamera::releaseRecordFrame(int index) * cases where fimc could crash if we called qbuf and it * wasn't expecting it. */ - LOGI("%s: recording not in progress, ignoring", __func__); + ALOGI("%s: recording not in progress, ignoring", __func__); return 0; } @@ -1123,10 +1123,10 @@ int SecCamera::endSnapshot(void) { int ret; - LOGI("%s :", __func__); + ALOGI("%s :", __func__); if (m_capture_buf.start) { munmap(m_capture_buf.start, m_capture_buf.length); - LOGI("munmap():virt. addr %p size = %d\n", + ALOGI("munmap():virt. addr %p size = %d\n", m_capture_buf.start, m_capture_buf.length); m_capture_buf.start = NULL; m_capture_buf.length = 0; @@ -1366,7 +1366,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu LOG_TIME_END(2) - LOGI("%s : calling memcpy from m_capture_buf", __func__); + ALOGI("%s : calling memcpy from m_capture_buf", __func__); memcpy(yuv_buf, (unsigned char*)m_capture_buf.start, m_snapshot_width * m_snapshot_height * 2); LOG_TIME_START(5) // post fimc_v4l2_streamoff(m_cam_fd); diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 5599862..8609918 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -376,7 +376,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) mPreviewLock.lock(); if (mPreviewRunning && !mPreviewStartDeferred) { - LOGI("stop preview (window change)"); + ALOGI("stop preview (window change)"); stopPreviewInternal(); } @@ -477,21 +477,21 @@ void CameraHardwareSec::setSkipFrame(int frame) int CameraHardwareSec::previewThreadWrapper() { - LOGI("%s: starting", __func__); + ALOGI("%s: starting", __func__); while (1) { mPreviewLock.lock(); while (!mPreviewRunning) { - LOGI("%s: calling mSecCamera->stopPreview() and waiting", __func__); + ALOGI("%s: calling mSecCamera->stopPreview() and waiting", __func__); mSecCamera->stopPreview(); /* signal that we're stopping */ mPreviewStoppedCondition.signal(); mPreviewCondition.wait(mPreviewLock); - LOGI("%s: return from wait", __func__); + ALOGI("%s: return from wait", __func__); } mPreviewLock.unlock(); if (mExitPreviewThread) { - LOGI("%s: exiting", __func__); + ALOGI("%s: exiting", __func__); mSecCamera->stopPreview(); return 0; } @@ -680,7 +680,7 @@ status_t CameraHardwareSec::startPreview() mPreviewStartDeferred = false; if (!mPreviewWindow) { - LOGI("%s : deferring", __func__); + ALOGI("%s : deferring", __func__); mPreviewStartDeferred = true; mPreviewLock.unlock(); return NO_ERROR; @@ -746,7 +746,7 @@ void CameraHardwareSec::stopPreviewInternal() else ALOGV("%s : preview running but deferred, doing nothing", __func__); } else - LOGI("%s : preview not running, doing nothing", __func__); + ALOGI("%s : preview not running, doing nothing", __func__); } void CameraHardwareSec::stopPreview() @@ -1111,7 +1111,7 @@ int CameraHardwareSec::pictureThread() ret = UNKNOWN_ERROR; goto out; } - LOGI("snapshotandjpeg done\n"); + ALOGI("snapshotandjpeg done\n"); } LOG_TIME_END(1) @@ -1120,7 +1120,7 @@ int CameraHardwareSec::pictureThread() if (mSecCamera->getCameraId() == SecCamera::CAMERA_ID_BACK) { isLSISensor = !strncmp((const char*)mCameraSensorName, "S5K4ECGX", 8); if(isLSISensor) { - LOGI("== Camera Sensor Detect %s - Samsung LSI SOC 5M ==\n", mCameraSensorName); + ALOGI("== Camera Sensor Detect %s - Samsung LSI SOC 5M ==\n", mCameraSensorName); // LSI 5M SOC if (!SplitFrame(jpeg_data, SecCamera::getInterleaveDataSize(), SecCamera::getJpegLineLength(), @@ -1131,7 +1131,7 @@ int CameraHardwareSec::pictureThread() goto out; } } else { - LOGI("== Camera Sensor Detect %s Sony SOC 5M ==\n", mCameraSensorName); + ALOGI("== Camera Sensor Detect %s Sony SOC 5M ==\n", mCameraSensorName); decodeInterleaveData(jpeg_data, SecCamera::getInterleaveDataSize(), mPostViewWidth, mPostViewHeight, @@ -2316,7 +2316,7 @@ static camera_device_t *g_cam_device; static int HAL_camera_device_close(struct hw_device_t* device) { - LOGI("%s", __func__); + ALOGI("%s", __func__); if (device) { camera_device_t *cam_device = (camera_device_t *)device; delete static_cast(cam_device->priv); @@ -2684,13 +2684,13 @@ static int HAL_camera_device_open(const struct hw_module_t* module, g_cam_device->ops = &camera_device_ops; - LOGI("%s: open camera %s", __func__, id); + ALOGI("%s: open camera %s", __func__, id); g_cam_device->priv = new CameraHardwareSec(cameraId, g_cam_device); done: *device = (hw_device_t *)g_cam_device; - LOGI("%s: opened camera %s (%p)", __func__, id, *device); + ALOGI("%s: opened camera %s (%p)", __func__, id, *device); return 0; } diff --git a/libhwcomposer/SecHWC.cpp b/libhwcomposer/SecHWC.cpp index 74f1a2a..e9a710a 100644 --- a/libhwcomposer/SecHWC.cpp +++ b/libhwcomposer/SecHWC.cpp @@ -539,7 +539,7 @@ static int hwc_device_open(const struct hw_module_t* module, const char* name, for (int j = 0; j < NUM_OF_WIN_BUF; j++) { win->addr[j] = win->fix_info.smem_start + (win->size * j); - LOGI("%s::win-%d add[%d] %x ", __func__, i, j, win->addr[j]); + ALOGI("%s::win-%d add[%d] %x ", __func__, i, j, win->addr[j]); } } diff --git a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c index 2ee0b79..592ebd6 100644 --- a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c +++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c @@ -69,7 +69,7 @@ static mfc_packed_mode isPBPacked(_MFCLIB *pCtx, int length) do { if (*strmBuffer == 'p') { - LOGI("isPBPacked: Packed PB\n"); + ALOGI("isPBPacked: Packed PB\n"); return MFC_PACKED_PB; } getAByte(strmBuffer, &startCode); -- cgit v1.1