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

Commit 40978458 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefea6f557e924385c557fb7154a6db00f2081986
parents 7556b81f 49467f1c

media/jni/android_media_tv_Tuner.cpp

+5 −1
Original line number Diff line number Diff line
@@ -169,8 +169,9 @@ static fields_t gFields; 
static int IP_V4_LENGTH = 4;

static int IP_V6_LENGTH = 16;



void DestroyCallback(const C2Buffer * /* buf */, void *arg) {

void DestroyCallback(const C2Buffer * buf, void *arg) {

    android::sp<android::MediaEvent> event = (android::MediaEvent *)arg;

    android::Mutex::Autolock autoLock(event->mLock);

    if (event->mLinearBlockObj != NULL) {

        JNIEnv *env = android::AndroidRuntime::getJNIEnv();

        env->DeleteWeakGlobalRef(event->mLinearBlockObj);
@@ -179,6 +180,7 @@ void DestroyCallback(const C2Buffer * /* buf */, void *arg) { 


    event->mAvHandleRefCnt--;

    event->finalize();

    event->decStrong(buf);

}



namespace android {
@@ -369,6 +371,7 @@ jobject MediaEvent::getLinearBlock() { 
            pC2Buffer->setInfo(info);

        }

        pC2Buffer->registerOnDestroyNotify(&DestroyCallback, this);

        incStrong(pC2Buffer.get());

        jobject linearBlock =

                env->NewObject(

                        env->FindClass("android/media/MediaCodec$LinearBlock"),
@@ -3646,6 +3649,7 @@ static jobject android_media_tv_Tuner_media_event_get_linear_block( 
        ALOGD("Failed get MediaEvent");

        return NULL;

    }

    android::Mutex::Autolock autoLock(mediaEventSp->mLock);



    return mediaEventSp->getLinearBlock();

}