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

Commit 71c7de84 authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "media: fix race condition around release"

parents 665f5b9b 61796fda

media/java/android/media/MediaCodec.java

+14 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ import java.nio.ReadOnlyBufferException; 
import java.util.Arrays;

import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.locks.Lock;

import java.util.concurrent.locks.ReentrantLock;



/**

 MediaCodec class can be used to access low-level media codecs, i.e. encoder/decoder components.
@@ -3582,7 +3584,18 @@ final public class MediaCodec { 
    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private long mNativeContext;

    private long mNativeContext = 0;

    private final Lock mNativeContextLock = new ReentrantLock();



    private final long lockAndGetContext() {

        mNativeContextLock.lock();

        return mNativeContext;

    }



    private final void setAndUnlockContext(long context) {

        mNativeContext = context;

        mNativeContextLock.unlock();

    }



    /** @hide */

    public static class MediaImage extends Image {

media/jni/android_media_MediaCodec.cpp

+17 −8
Original line number Diff line number Diff line
@@ -108,8 +108,9 @@ static struct { 
} gCodecInfo;



struct fields_t {

    jfieldID context;

    jmethodID postEventFromNativeID;

    jmethodID lockAndGetContextID;

    jmethodID setAndUnlockContextID;

    jfieldID cryptoInfoNumSubSamplesID;

    jfieldID cryptoInfoNumBytesOfClearDataID;

    jfieldID cryptoInfoNumBytesOfEncryptedDataID;
@@ -931,7 +932,7 @@ using namespace android; 


static sp<JMediaCodec> setMediaCodec(

        JNIEnv *env, jobject thiz, const sp<JMediaCodec> &codec) {

    sp<JMediaCodec> old = (JMediaCodec *)env->GetLongField(thiz, gFields.context);

    sp<JMediaCodec> old = (JMediaCodec *)env->CallLongMethod(thiz, gFields.lockAndGetContextID);

    if (codec != NULL) {

        codec->incStrong(thiz);

    }
@@ -944,13 +945,15 @@ static sp<JMediaCodec> setMediaCodec( 
        old->release();

        old->decStrong(thiz);

    }

    env->SetLongField(thiz, gFields.context, (jlong)codec.get());

    env->CallVoidMethod(thiz, gFields.setAndUnlockContextID, (jlong)codec.get());



    return old;

}



static sp<JMediaCodec> getMediaCodec(JNIEnv *env, jobject thiz) {

    return (JMediaCodec *)env->GetLongField(thiz, gFields.context);

    sp<JMediaCodec> codec = (JMediaCodec *)env->CallLongMethod(thiz, gFields.lockAndGetContextID);

    env->CallVoidMethod(thiz, gFields.setAndUnlockContextID, (jlong)codec.get());

    return codec;

}



static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) {
@@ -1876,15 +1879,21 @@ static void android_media_MediaCodec_native_init(JNIEnv *env) { 
            env, env->FindClass("android/media/MediaCodec"));

    CHECK(clazz.get() != NULL);



    gFields.context = env->GetFieldID(clazz.get(), "mNativeContext", "J");

    CHECK(gFields.context != NULL);



    gFields.postEventFromNativeID =

        env->GetMethodID(

                clazz.get(), "postEventFromNative", "(IIILjava/lang/Object;)V");



    CHECK(gFields.postEventFromNativeID != NULL);



    gFields.lockAndGetContextID =

        env->GetMethodID(

                clazz.get(), "lockAndGetContext", "()J");

    CHECK(gFields.lockAndGetContextID != NULL);



    gFields.setAndUnlockContextID =

        env->GetMethodID(

                clazz.get(), "setAndUnlockContext", "(J)V");

    CHECK(gFields.setAndUnlockContextID != NULL);



    jfieldID field;

    field = env->GetStaticFieldID(clazz.get(), "CRYPTO_MODE_UNENCRYPTED", "I");

    CHECK(field != NULL);