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/mediaplayer.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/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 0be01a9..406f9f2 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -17,12 +17,14 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "MediaPlayer" -#include <utils/Log.h> -#include <sys/types.h> +#include <fcntl.h> +#include <inttypes.h> #include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> -#include <fcntl.h> + +#include <utils/Log.h> #include <binder/IServiceManager.h> #include <binder/IPCThreadState.h> @@ -157,7 +159,7 @@ status_t MediaPlayer::setDataSource( status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) { - ALOGV("setDataSource(%d, %lld, %lld)", fd, offset, length); + ALOGV("setDataSource(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length); status_t err = UNKNOWN_ERROR; const sp<IMediaPlayerService>& service(getMediaPlayerService()); if (service != 0) { @@ -194,7 +196,7 @@ status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply) (mCurrentState != MEDIA_PLAYER_STATE_ERROR) && ((mCurrentState & MEDIA_PLAYER_IDLE) != MEDIA_PLAYER_IDLE); if ((mPlayer != NULL) && hasBeenInitialized) { - ALOGV("invoke %d", request.dataSize()); + ALOGV("invoke %zu", request.dataSize()); return mPlayer->invoke(request, reply); } ALOGE("invoke failed: wrong state %X", mCurrentState); @@ -818,7 +820,7 @@ void MediaPlayer::died() audio_format_t* pFormat, const sp<IMemoryHeap>& heap, size_t *pSize) { - ALOGV("decode(%d, %lld, %lld)", fd, offset, length); + ALOGV("decode(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length); status_t status; const sp<IMediaPlayerService>& service = getMediaPlayerService(); if (service != 0) { |