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

Commit a7214a1f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "media: lazy MediaCodec.release()"" into rvc-dev am: 3b07f4fa 

Change-Id: I6d51b87c19bada6ce80e5fa5aa6cda26b1303d4a
parents 59f97c80 3b07f4fa

media/jni/android_media_MediaCodec.cpp

+2 −12
Original line number Diff line number Diff line
@@ -242,13 +242,6 @@ void JMediaCodec::release() { 
    });

}



void JMediaCodec::releaseAsync() {

    if (mCodec != NULL) {

        mCodec->releaseAsync();

    }

    mInitStatus = NO_INIT;

}



JMediaCodec::~JMediaCodec() {

    if (mLooper != NULL) {

        /* MediaCodec and looper should have been released explicitly already
@@ -1131,10 +1124,7 @@ static sp<JMediaCodec> getMediaCodec(JNIEnv *env, jobject thiz) { 
}



static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) {

    sp<JMediaCodec> codec = getMediaCodec(env, thiz);

    if (codec != NULL) {

        codec->releaseAsync();

    }

    setMediaCodec(env, thiz, NULL);

}



static void throwCodecException(JNIEnv *env, status_t err, int32_t actionCode, const char *msg) {
@@ -2807,7 +2797,7 @@ static void android_media_MediaCodec_native_setup( 


static void android_media_MediaCodec_native_finalize(

        JNIEnv *env, jobject thiz) {

    setMediaCodec(env, thiz, NULL);

    android_media_MediaCodec_release(env, thiz);

}



// MediaCodec.LinearBlock

media/jni/android_media_MediaCodec.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct JMediaCodec : public AHandler { 


    void registerSelf();

    void release();

    void releaseAsync();



    status_t enableOnFrameRenderedListener(jboolean enable);