diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-06-18 16:30:56 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-20 07:36:25 -0700 |
commit | 34fb29696b0f3abf61b10f8d053b1f33d501de0a (patch) | |
tree | 4511e1ea03cdcfe50a4754904a507ec1ca6ac1b7 /media/libmedia/SoundPool.cpp | |
parent | 23307f736759efbdc6125e1ec0abbc4b48036346 (diff) | |
download | frameworks_av-34fb29696b0f3abf61b10f8d053b1f33d501de0a.zip frameworks_av-34fb29696b0f3abf61b10f8d053b1f33d501de0a.tar.gz frameworks_av-34fb29696b0f3abf61b10f8d053b1f33d501de0a.tar.bz2 |
libmedia: 64-bit compile warnings
Change-Id: I600f062fa7148c01851023c1240c39939e648002
Diffstat (limited to 'media/libmedia/SoundPool.cpp')
-rw-r--r-- | media/libmedia/SoundPool.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index a55e09c..2aa0592 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -16,6 +16,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "SoundPool" + +#include <inttypes.h> + #include <utils/Log.h> #define USE_SHARED_MEM_BUFFER @@ -212,7 +215,7 @@ int SoundPool::load(const char* path, int priority __unused) int SoundPool::load(int fd, int64_t offset, int64_t length, int priority __unused) { - ALOGV("load: fd=%d, offset=%lld, length=%lld, priority=%d", + ALOGV("load: fd=%d, offset=%" PRId64 ", length=%" PRId64 ", priority=%d", fd, offset, length, priority); Mutex::Autolock lock(&mLock); sp<Sample> sample = new Sample(++mNextSampleID, fd, offset, length); @@ -462,7 +465,8 @@ Sample::Sample(int sampleID, int fd, int64_t offset, int64_t length) mFd = dup(fd); mOffset = offset; mLength = length; - ALOGV("create sampleID=%d, fd=%d, offset=%lld, length=%lld", mSampleID, mFd, mLength, mOffset); + ALOGV("create sampleID=%d, fd=%d, offset=%" PRId64 " length=%" PRId64, + mSampleID, mFd, mLength, mOffset); } void Sample::init() @@ -516,7 +520,7 @@ status_t Sample::doLoad() ALOGE("Unable to load sample: %s", mUrl); goto error; } - ALOGV("pointer = %p, size = %u, sampleRate = %u, numChannels = %d", + ALOGV("pointer = %p, size = %zu, sampleRate = %u, numChannels = %d", mHeap->getBase(), mSize, sampleRate, numChannels); if (sampleRate > kMaxSampleRate) { |