summaryrefslogtreecommitdiff
path: root/libs/gui/StreamSplitter.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-06-09 14:32:04 -0700
committer Mark Salyzyn <salyzyn@google.com> 2014-06-09 15:42:26 -0700
commit8f515ce1c57379cafac4357bc4fdb61dd346ec5f (patch)
treec23cd7e401bc2256391f02009f583250f3c38fbf /libs/gui/StreamSplitter.cpp
parentcb29225a5e81b12acb10eefa66ad70b333183185 (diff)
libgui: 64 bit compile issues (part deux)
- nsecs_t printed with PRId64 - int64_t/uint64_t print issues - some size_t printing issues. - missing argument to BQ_LOGV Change-Id: I493f2b578e801dc38c44f8c536faa45266720402
Diffstat (limited to 'libs/gui/StreamSplitter.cpp')
-rw-r--r--libs/gui/StreamSplitter.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/libs/gui/StreamSplitter.cpp b/libs/gui/StreamSplitter.cpp
index 83e08fb871..771b263e76 100644
--- a/libs/gui/StreamSplitter.cpp
+++ b/libs/gui/StreamSplitter.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <inttypes.h>
+
#define LOG_TAG "StreamSplitter"
#define ATRACE_TAG ATRACE_TAG_GRAPHICS
//#define LOG_NDEBUG 0
@@ -63,7 +65,7 @@ StreamSplitter::~StreamSplitter() {
}
if (mBuffers.size() > 0) {
- ALOGE("%d buffers still being tracked", mBuffers.size());
+ ALOGE("%zu buffers still being tracked", mBuffers.size());
}
}
@@ -126,7 +128,7 @@ void StreamSplitter::onFrameAvailable() {
LOG_ALWAYS_FATAL_IF(status != NO_ERROR,
"acquiring buffer from input failed (%d)", status);
- ALOGV("acquired buffer %#llx from input",
+ ALOGV("acquired buffer %#" PRIx64 " from input",
bufferItem.mGraphicBuffer->getId());
status = mInput->detachBuffer(bufferItem.mBuf);
@@ -176,7 +178,7 @@ void StreamSplitter::onFrameAvailable() {
"queueing buffer to output failed (%d)", status);
}
- ALOGV("queued buffer %#llx to output %p",
+ ALOGV("queued buffer %#" PRIx64 " to output %p",
bufferItem.mGraphicBuffer->getId(), output->get());
}
}
@@ -199,7 +201,8 @@ void StreamSplitter::onBufferReleasedByOutput(
"detaching buffer from output failed (%d)", status);
}
- ALOGV("detached buffer %#llx from output %p", buffer->getId(), from.get());
+ ALOGV("detached buffer %#" PRIx64 " from output %p",
+ buffer->getId(), from.get());
const sp<BufferTracker>& tracker = mBuffers.editValueFor(buffer->getId());
@@ -209,7 +212,7 @@ void StreamSplitter::onBufferReleasedByOutput(
// Check to see if this is the last outstanding reference to this buffer
size_t releaseCount = tracker->incrementReleaseCountLocked();
- ALOGV("buffer %#llx reference count %d (of %d)", buffer->getId(),
+ ALOGV("buffer %#" PRIx64 " reference count %zu (of %zu)", buffer->getId(),
releaseCount, mOutputs.size());
if (releaseCount < mOutputs.size()) {
return;
@@ -233,7 +236,7 @@ void StreamSplitter::onBufferReleasedByOutput(
LOG_ALWAYS_FATAL_IF(status != NO_ERROR,
"releasing buffer to input failed (%d)", status);
- ALOGV("released buffer %#llx to input", buffer->getId());
+ ALOGV("released buffer %#" PRIx64 " to input", buffer->getId());
// We no longer need to track the buffer once it has been returned to the
// input