diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-18 16:34:45 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-26 14:56:27 +0000 |
| commit | a5750e0dad9e90f2195ce36f2c4457fa04b2b83e (patch) | |
| tree | cba2a1ae57e4a61fba2fe3a39d6411aa731950ac /media/libstagefright/SurfaceMediaSource.cpp | |
| parent | ff17990df24913df9267c9c8b938178716298114 (diff) | |
| download | frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.zip frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.gz frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.bz2 | |
libstagefright: 64-bit compile warnings
Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
Diffstat (limited to 'media/libstagefright/SurfaceMediaSource.cpp')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 62aea36..4e1c65c 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -16,6 +16,8 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "SurfaceMediaSource" +#include <inttypes.h> + #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/SurfaceMediaSource.h> #include <media/stagefright/MediaDefs.h> @@ -179,7 +181,7 @@ status_t SurfaceMediaSource::start(MetaData *params) } status_t SurfaceMediaSource::setMaxAcquiredBufferCount(size_t count) { - ALOGV("setMaxAcquiredBufferCount(%d)", count); + ALOGV("setMaxAcquiredBufferCount(%zu)", count); Mutex::Autolock lock(mMutex); CHECK_GT(count, 1); @@ -209,7 +211,7 @@ status_t SurfaceMediaSource::stop() mFrameAvailableCondition.signal(); while (mNumPendingBuffers > 0) { - ALOGI("Still waiting for %d buffers to be returned.", + ALOGI("Still waiting for %zu buffers to be returned.", mNumPendingBuffers); #if DEBUG_PENDING_BUFFERS @@ -269,7 +271,7 @@ static void passMetadataBuffer(MediaBuffer **buffer, memcpy(data, &type, 4); memcpy(data + 4, &bufferHandle, sizeof(buffer_handle_t)); - ALOGV("handle = %p, , offset = %d, length = %d", + ALOGV("handle = %p, , offset = %zu, length = %zu", bufferHandle, (*buffer)->range_length(), (*buffer)->range_offset()); } @@ -363,7 +365,7 @@ status_t SurfaceMediaSource::read( (*buffer)->setObserver(this); (*buffer)->add_ref(); (*buffer)->meta_data()->setInt64(kKeyTime, mCurrentTimestamp / 1000); - ALOGV("Frames encoded = %d, timestamp = %lld, time diff = %lld", + ALOGV("Frames encoded = %d, timestamp = %" PRId64 ", time diff = %" PRId64, mNumFramesEncoded, mCurrentTimestamp / 1000, mCurrentTimestamp / 1000 - prevTimeStamp / 1000); |