diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2014-03-05 15:23:13 +0000 |
|---|---|---|
| committer | Ashok Bhat <ashok.bhat@arm.com> | 2014-03-25 10:39:13 +0000 |
| commit | 136c08a7d3678e9fcf22667e75b0904a94add6bb (patch) | |
| tree | e5d1613b8ad87830ce5e499f0e52a3d2c8b2d794 /media/jni/android_media_MediaExtractor.cpp | |
| parent | 557a93e104f1fec69ed05b2d0ff26c78bca4c5d6 (diff) | |
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 <ashok.bhat@arm.com>
Diffstat (limited to 'media/jni/android_media_MediaExtractor.cpp')
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 543cb6c1d6a7..854ee794ba1f 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, |