Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

Browse Source 
* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
  Cast CallMethod's size_t parameters to jint
This commit is contained in:
Narayan Kamath
2014-03-31 09:41:39 +00:00
committed by Android Git Automerger
parent 44b43a51c7 91bbb75c75
commit 0e3f3c7022
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaExtractor.cpp
View File

@@ -84,7 +84,7 @@ class JavaDataSourceBridge : public DataSource {
jbyteArray byteArrayObj = env->NewByteArray(size); jbyteArray byteArrayObj = env->NewByteArray(size);
env->DeleteLocalRef(env->GetObjectClass(mDataSource)); env->DeleteLocalRef(env->GetObjectClass(mDataSource));
env->DeleteLocalRef(env->GetObjectClass(byteArrayObj)); 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->GetByteArrayRegion(byteArrayObj, 0, size, (jbyte*) buffer);
env->DeleteLocalRef(byteArrayObj); env->DeleteLocalRef(byteArrayObj);
if (env->ExceptionCheck()) { if (env->ExceptionCheck()) {
@@ -627,7 +627,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo(
env->CallVoidMethod( env->CallVoidMethod(
cryptoInfoObj, cryptoInfoObj,
gFields.cryptoInfoSetID, gFields.cryptoInfoSetID,
numSubSamples, (jint)numSubSamples,
numBytesOfPlainDataObj, numBytesOfPlainDataObj,
numBytesOfEncryptedDataObj, numBytesOfEncryptedDataObj,
keyObj, keyObj,