From 98f28cde0d5d682956b5e6b119823e7e8d40415b Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 18 Jun 2014 16:32:50 -0700 Subject: ndk: 64-bit compile warnings Change-Id: I214973a97547bf714e56e4596359cb2bd9cdea9c --- media/ndk/NdkMediaCodec.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'media/ndk/NdkMediaCodec.cpp') diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index c5d8858..ed00b72 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include + //#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaCodec" @@ -257,7 +259,7 @@ uint8_t* AMediaCodec_getInputBuffer(AMediaCodec *mData, size_t idx, size_t *out_ if (mData->mCodec->getInputBuffers(&abufs) == 0) { size_t n = abufs.size(); if (idx >= n) { - ALOGE("buffer index %d out of range", idx); + ALOGE("buffer index %zu out of range", idx); return NULL; } if (out_size != NULL) { @@ -275,7 +277,7 @@ uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec *mData, size_t idx, size_t *out if (mData->mCodec->getOutputBuffers(&abufs) == 0) { size_t n = abufs.size(); if (idx >= n) { - ALOGE("buffer index %d out of range", idx); + ALOGE("buffer index %zu out of range", idx); return NULL; } if (out_size != NULL) { @@ -345,7 +347,7 @@ media_status_t AMediaCodec_releaseOutputBuffer(AMediaCodec *mData, size_t idx, b EXPORT media_status_t AMediaCodec_releaseOutputBufferAtTime( AMediaCodec *mData, size_t idx, int64_t timestampNs) { - ALOGV("render @ %lld", timestampNs); + ALOGV("render @ %" PRId64, timestampNs); return translate_error(mData->mCodec->renderOutputBufferAndRelease(idx, timestampNs)); } @@ -413,7 +415,7 @@ AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new( size_t cryptosize = sizeof(AMediaCodecCryptoInfo) + sizeof(size_t) * numsubsamples * 2; AMediaCodecCryptoInfo *ret = (AMediaCodecCryptoInfo*) malloc(cryptosize); if (!ret) { - ALOGE("couldn't allocate %d bytes", cryptosize); + ALOGE("couldn't allocate %zu bytes", cryptosize); return NULL; } ret->numsubsamples = numsubsamples; -- cgit v1.1