From 136c08a7d3678e9fcf22667e75b0904a94add6bb Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Wed, 5 Mar 2014 15:23:13 +0000 Subject: [PATCH] Cast CallMethod's size_t parameters to jint This will avoid problems caused by automatic type promotion of parameters when passed to a variadic function. Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4 Signed-off-by: Ashok Bhat --- media/jni/android_media_MediaExtractor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 543cb6c1d6a7e..854ee794ba1fe 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -84,7 +84,7 @@ class JavaDataSourceBridge : public DataSource { jbyteArray byteArrayObj = env->NewByteArray(size); env->DeleteLocalRef(env->GetObjectClass(mDataSource)); env->DeleteLocalRef(env->GetObjectClass(byteArrayObj)); - ssize_t numread = env->CallIntMethod(mDataSource, mReadMethod, offset, byteArrayObj, size); + ssize_t numread = env->CallIntMethod(mDataSource, mReadMethod, offset, byteArrayObj, (jint)size); env->GetByteArrayRegion(byteArrayObj, 0, size, (jbyte*) buffer); env->DeleteLocalRef(byteArrayObj); if (env->ExceptionCheck()) { @@ -627,7 +627,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo( env->CallVoidMethod( cryptoInfoObj, gFields.cryptoInfoSetID, - numSubSamples, + (jint)numSubSamples, numBytesOfPlainDataObj, numBytesOfEncryptedDataObj, keyObj,