diff options
author | Colin Cross <ccross@android.com> | 2014-03-21 15:04:25 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2014-03-21 15:04:25 -0700 |
commit | e5729fac81c8a984e984fefc90afc64135817d4f (patch) | |
tree | 526e94e71d66a2cf8faac48c16716bf3c757a2a6 /services/camera/libcameraservice/gui | |
parent | 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a (diff) | |
download | frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.zip frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.tar.gz frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.tar.bz2 |
libcameraservice: fix 64-bit print format warnings
Use PRId64 from inttypes.h to print nsecs_t (int64_t)
Use %zu to print size_t
Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
Diffstat (limited to 'services/camera/libcameraservice/gui')
-rw-r--r-- | services/camera/libcameraservice/gui/RingBufferConsumer.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp index 9a6dc28..e4ec5fd 100644 --- a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp +++ b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp @@ -17,6 +17,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "RingBufferConsumer" #define ATRACE_TAG ATRACE_TAG_GRAPHICS + +#include <inttypes.h> + #include <utils/Log.h> #include <gui/RingBufferConsumer.h> @@ -164,10 +167,10 @@ void RingBufferConsumer::pinBufferLocked(const BufferItem& item) { } if (it == end) { - BI_LOGE("Failed to pin buffer (timestamp %lld, framenumber %lld)", + BI_LOGE("Failed to pin buffer (timestamp %" PRId64 ", framenumber %" PRIu64 ")", item.mTimestamp, item.mFrameNumber); } else { - BI_LOGV("Pinned buffer (frame %lld, timestamp %lld)", + BI_LOGV("Pinned buffer (frame %" PRIu64 ", timestamp %" PRId64 ")", item.mFrameNumber, item.mTimestamp); } } @@ -222,12 +225,12 @@ status_t RingBufferConsumer::releaseOldestBufferLocked(size_t* pinnedFrames) { if (err != OK) { BI_LOGE("Failed to add release fence to buffer " - "(timestamp %lld, framenumber %lld", + "(timestamp %" PRId64 ", framenumber %" PRIu64, item.mTimestamp, item.mFrameNumber); return err; } - BI_LOGV("Attempting to release buffer timestamp %lld, frame %lld", + BI_LOGV("Attempting to release buffer timestamp %" PRId64 ", frame %" PRIu64, item.mTimestamp, item.mFrameNumber); // item.mGraphicBuffer was populated with the proper graphic-buffer @@ -241,7 +244,7 @@ status_t RingBufferConsumer::releaseOldestBufferLocked(size_t* pinnedFrames) { return err; } - BI_LOGV("Buffer timestamp %lld, frame %lld evicted", + BI_LOGV("Buffer timestamp %" PRId64 ", frame %" PRIu64 " evicted", item.mTimestamp, item.mFrameNumber); size_t currentSize = mBufferItemList.size(); @@ -294,8 +297,8 @@ void RingBufferConsumer::onFrameAvailable() { return; } - BI_LOGV("New buffer acquired (timestamp %lld), " - "buffer items %u out of %d", + BI_LOGV("New buffer acquired (timestamp %" PRId64 "), " + "buffer items %zu out of %d", item.mTimestamp, mBufferItemList.size(), mBufferCount); @@ -321,7 +324,7 @@ void RingBufferConsumer::unpinBuffer(const BufferItem& item) { if (res != OK) { BI_LOGE("Failed to add release fence to buffer " - "(timestamp %lld, framenumber %lld", + "(timestamp %" PRId64 ", framenumber %" PRIu64, item.mTimestamp, item.mFrameNumber); return; } @@ -333,10 +336,10 @@ void RingBufferConsumer::unpinBuffer(const BufferItem& item) { if (it == end) { // This should never happen. If it happens, we have a bug. - BI_LOGE("Failed to unpin buffer (timestamp %lld, framenumber %lld)", + BI_LOGE("Failed to unpin buffer (timestamp %" PRId64 ", framenumber %" PRIu64 ")", item.mTimestamp, item.mFrameNumber); } else { - BI_LOGV("Unpinned buffer (timestamp %lld, framenumber %lld)", + BI_LOGV("Unpinned buffer (timestamp %" PRId64 ", framenumber %" PRIu64 ")", item.mTimestamp, item.mFrameNumber); } } |