Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37109819 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 

* commit '303d666f':
  Cast CallMethod's size_t parameters to jint
parents 00bc2834 303d666f

media/jni/android_media_MediaExtractor.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,7 +87,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()) {
@@ -632,7 +632,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,