diff options
| author | Steve Block <steveblock@google.com> | 2011-12-20 16:25:43 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-03 22:32:05 +0000 |
| commit | 86464682938499e7f15ea15fecad674f3e71e33c (patch) | |
| tree | de4bc6a0492f9bf55b6c0b9e380c3cdae2ea0d93 /camera | |
| parent | 6812f3ca07dd52fd464639d7d85f33448098d254 (diff) | |
| download | hardware_ti_omap4-86464682938499e7f15ea15fecad674f3e71e33c.zip hardware_ti_omap4-86464682938499e7f15ea15fecad674f3e71e33c.tar.gz hardware_ti_omap4-86464682938499e7f15ea15fecad674f3e71e33c.tar.bz2 | |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I551e5a040249a8908251cd8c8d7131287f1f53de
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraHalCommon.cpp | 6 | ||||
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 2 | ||||
| -rw-r--r-- | camera/V4LCameraAdapter/V4LCameraAdapter.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/camera/CameraHalCommon.cpp b/camera/CameraHalCommon.cpp index 6d4ea2c..7e81a09 100644 --- a/camera/CameraHalCommon.cpp +++ b/camera/CameraHalCommon.cpp @@ -46,7 +46,7 @@ void CameraHal::PPM(const char* str){ ppm.tv_sec = ppm.tv_sec * 1000000; ppm.tv_sec = ppm.tv_sec + ppm.tv_usec - ppm_start.tv_usec; - LOGD("PPM: %s :%ld.%ld ms", str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 )); + ALOGD("PPM: %s :%ld.%ld ms", str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 )); } #elif PPM_INSTRUMENTATION_ABS @@ -76,7 +76,7 @@ void CameraHal::PPM(const char* str){ absolute *= 1000; absolute += ppm.tv_usec /1000; - LOGD("PPM: %s :%llu.%llu ms : %llu ms", str, ( elapsed /1000 ), ( elapsed % 1000 ), absolute); + ALOGD("PPM: %s :%llu.%llu ms : %llu ms", str, ( elapsed /1000 ), ( elapsed % 1000 ), absolute); } #endif @@ -109,7 +109,7 @@ void CameraHal::PPM(const char* str, struct timeval* ppm_first, ...){ ppm.tv_sec = ppm.tv_sec * 1000000; ppm.tv_sec = ppm.tv_sec + ppm.tv_usec - ppm_first->tv_usec; - LOGD("PPM: %s :%ld.%ld ms : %llu ms", temp_str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ), absolute); + ALOGD("PPM: %s :%ld.%ld ms : %llu ms", temp_str, ( ppm.tv_sec /1000 ), ( ppm.tv_sec % 1000 ), absolute); va_end(args); } diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index a58ca45..d6ffa57 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -2854,7 +2854,7 @@ static void debugShowFPS() mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff; mLastFpsTime = now; mLastFrameCount = mFrameCount; - LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps); + ALOGD("Camera %d Frames, %f FPS", mFrameCount, mFps); } // XXX: mFPS has the value we want } diff --git a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp index 3fb3380..c365023 100644 --- a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp +++ b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp @@ -438,7 +438,7 @@ static void debugShowFPS() mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff; mLastFpsTime = now; mLastFrameCount = mFrameCount; - LOGD("Camera %d Frames, %f FPS", mFrameCount, mFps); + ALOGD("Camera %d Frames, %f FPS", mFrameCount, mFps); } // XXX: mFPS has the value we want } |