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/MediaPlayerService.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/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 56521a2..d550bfc 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -21,6 +21,7 @@ #define LOG_TAG "MediaPlayerService" #include <utils/Log.h> +#include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> @@ -148,7 +149,7 @@ bool unmarshallFilter(const Parcel& p, if (p.dataAvail() < size) { - ALOGE("Filter too short expected %d but got %d", size, p.dataAvail()); + ALOGE("Filter too short expected %zu but got %zu", size, p.dataAvail()); *status = NOT_ENOUGH_DATA; return false; } @@ -733,7 +734,7 @@ status_t MediaPlayerService::Client::setDataSource( status_t MediaPlayerService::Client::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); struct stat sb; int ret = fstat(fd, &sb); if (ret != 0) { @@ -741,11 +742,11 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 return UNKNOWN_ERROR; } - 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 = %" PRId64 "", sb.st_size); if (offset >= sb.st_size) { ALOGE("offset error"); @@ -754,7 +755,7 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 } if (offset + length > sb.st_size) { length = sb.st_size - offset; - ALOGV("calculated length = %lld", length); + ALOGV("calculated length = %" PRId64 "", length); } player_type playerType = MediaPlayerFactory::getPlayerType(this, @@ -1702,7 +1703,7 @@ status_t MediaPlayerService::AudioOutput::open( if (!bothOffloaded) { if (mRecycledTrack->frameCount() != t->frameCount()) { - ALOGV("framecount differs: %u/%u frames", + ALOGV("framecount differs: %zu/%zu frames", mRecycledTrack->frameCount(), t->frameCount()); reuse = false; } |