diff options
author | Praveen Chavan <pchavan@codeaurora.org> | 2015-06-19 19:40:09 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:12 -0600 |
commit | 0eb0c1dadf6b5c9948b7e4c63a5cde1adfa48c53 (patch) | |
tree | e8a35e07adcd915abd92ef5b39a67e044401c46f /media/libmediaplayerservice/MetadataRetrieverClient.cpp | |
parent | 3757661864d0e39d98598d06071d542af5af3bbd (diff) | |
download | frameworks_av-0eb0c1dadf6b5c9948b7e4c63a5cde1adfa48c53.zip frameworks_av-0eb0c1dadf6b5c9948b7e4c63a5cde1adfa48c53.tar.gz frameworks_av-0eb0c1dadf6b5c9948b7e4c63a5cde1adfa48c53.tar.bz2 |
mediaplayerservice: fix 64-bit compliation errors
Use correct format specifiers to fix 64-bit compilation.
Conflicts:
media/libmediaplayerservice/StagefrightRecorder.cpp
media/libstagefright/VideoFrameScheduler.cpp
Change-Id: Ic2238db525a23710716558015ca152871b4c549f
Diffstat (limited to 'media/libmediaplayerservice/MetadataRetrieverClient.cpp')
-rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index a5a1fa5..e338d72 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -19,6 +19,7 @@ #define LOG_TAG "MetadataRetrieverClient" #include <utils/Log.h> +#include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> @@ -133,7 +134,7 @@ status_t MetadataRetrieverClient::setDataSource( status_t MetadataRetrieverClient::setDataSource(int fd, int64_t offset, int64_t length) { - ALOGV("setDataSource fd=%d, offset=%lld, length=%lld", fd, offset, length); + ALOGV("setDataSource fd=%d, offset=%" PRId64 ", length=%" PRId64 "", fd, offset, length); Mutex::Autolock lock(mLock); struct stat sb; int ret = fstat(fd, &sb); @@ -141,20 +142,20 @@ status_t MetadataRetrieverClient::setDataSource(int fd, int64_t offset, int64_t ALOGE("fstat(%d) failed: %d, %s", fd, ret, strerror(errno)); return BAD_VALUE; } - ALOGV("st_dev = %llu", static_cast<uint64_t>(sb.st_dev)); + ALOGV("st_dev = %" PRIu64 "", static_cast<uint64_t>(sb.st_dev)); ALOGV("st_mode = %u", sb.st_mode); ALOGV("st_uid = %lu", static_cast<unsigned long>(sb.st_uid)); ALOGV("st_gid = %lu", static_cast<unsigned long>(sb.st_gid)); - ALOGV("st_size = %llu", sb.st_size); + ALOGV("st_size = %" PRIu64 "", sb.st_size); if (offset >= sb.st_size) { - ALOGE("offset (%lld) bigger than file size (%llu)", offset, sb.st_size); + ALOGE("offset (%" PRId64 ") bigger than file size (%" PRIu64 ")", offset, sb.st_size); ::close(fd); return BAD_VALUE; } if (offset + length > sb.st_size) { length = sb.st_size - offset; - ALOGV("calculated length = %lld", length); + ALOGV("calculated length = %" PRId64 "", length); } player_type playerType = @@ -195,7 +196,7 @@ Mutex MetadataRetrieverClient::sLock; sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option) { - ALOGV("getFrameAtTime: time(%lld us) option(%d)", timeUs, option); + ALOGV("getFrameAtTime: time(%" PRId64 " us) option(%d)", timeUs, option); Mutex::Autolock lock(mLock); Mutex::Autolock glock(sLock); mThumbnail.clear(); @@ -217,7 +218,7 @@ sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option) } mThumbnail = new MemoryBase(heap, 0, size); if (mThumbnail == NULL) { - ALOGE("not enough memory for VideoFrame size=%u", size); + ALOGE("not enough memory for VideoFrame size=%zu", size); delete frame; return NULL; } @@ -258,7 +259,7 @@ sp<IMemory> MetadataRetrieverClient::extractAlbumArt() } mAlbumArt = new MemoryBase(heap, 0, size); if (mAlbumArt == NULL) { - ALOGE("not enough memory for MediaAlbumArt size=%u", size); + ALOGE("not enough memory for MediaAlbumArt size=%zu", size); delete albumArt; return NULL; } |