commit 91bbb75c75568dee854fb10633f8ce3683265ffd
author Narayan Kamath <narayan@google.com> Mon Mar 31 09:37:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 31 09:37:32 2014 +0000
tree 6c0ebadc4ecc6dd888f5db1ce11897957f063c25
parent 1e4cad8198056a5e27a7aeb104ceb8ada331eafe
parent 136c08a7d3678e9fcf22667e75b0904a94add6bb

Merge "Cast CallMethod's size_t parameters to jint"

media/jni/android_media_MediaExtractor.cpp

diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp
index 543cb6c..854ee79 100644
--- a/media/jni/android_media_MediaExtractor.cpp
+++ b/media/jni/android_media_MediaExtractor.cpp
@@ -84,7 +84,7 @@
         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 @@
     env->CallVoidMethod(
             cryptoInfoObj,
             gFields.cryptoInfoSetID,
-            numSubSamples,
+            (jint)numSubSamples,
             numBytesOfPlainDataObj,
             numBytesOfEncryptedDataObj,
             keyObj,