diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-31 09:37:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-31 09:37:32 +0000 |
| commit | 91bbb75c75568dee854fb10633f8ce3683265ffd (patch) | |
| tree | 6c0ebadc4ecc6dd888f5db1ce11897957f063c25 | |
| parent | 1e4cad8198056a5e27a7aeb104ceb8ada331eafe (diff) | |
| parent | 136c08a7d3678e9fcf22667e75b0904a94add6bb (diff) | |
| download | base-91bbb75c75568dee854fb10633f8ce3683265ffd.tar.gz | |
Merge "Cast CallMethod's size_t parameters to jint"
| -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, |