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

Commit 14a7bf4c authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Improve handling MediaCodec linkToDeath() resource manager" into... 

Merge "Improve handling MediaCodec linkToDeath() resource manager" into rvc-dev am: 6542f433 am: e15bc27b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13312938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie13fa3d2d572fadac5f15da14a16dd702ea759b3
parents 8d14fc24 e15bc27b

media/libstagefright/MediaCodec.cpp

+38 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#define LOG_TAG "MediaCodec"

#include <utils/Log.h>



#include <set>



#include <inttypes.h>

#include <stdlib.h>
@@ -201,6 +203,10 @@ struct MediaCodec::ResourceManagerServiceProxy : public RefBase { 
    // implements DeathRecipient

    static void BinderDiedCallback(void* cookie);

    void binderDied();

    static Mutex sLockCookies;

    static std::set<void*> sCookies;

    static void addCookie(void* cookie);

    static void removeCookie(void* cookie);



    void addResource(const MediaResourceParcel &resource);

    void removeResource(const MediaResourceParcel &resource);
@@ -227,8 +233,15 @@ MediaCodec::ResourceManagerServiceProxy::ResourceManagerServiceProxy( 
}



MediaCodec::ResourceManagerServiceProxy::~ResourceManagerServiceProxy() {



    // remove the cookie, so any in-flight death notification will get dropped

    // by our handler.

    removeCookie(this);



    Mutex::Autolock _l(mLock);

    if (mService != nullptr) {

        AIBinder_unlinkToDeath(mService->asBinder().get(), mDeathRecipient.get(), this);

        mService = nullptr;

    }

}
@@ -240,17 +253,40 @@ void MediaCodec::ResourceManagerServiceProxy::init() { 
        return;

    }



    // so our handler will process the death notifications

    addCookie(this);



    // after this, require mLock whenever using mService

    AIBinder_linkToDeath(mService->asBinder().get(), mDeathRecipient.get(), this);



    // Kill clients pending removal.

    mService->reclaimResourcesFromClientsPendingRemoval(mPid);

}



//static

Mutex MediaCodec::ResourceManagerServiceProxy::sLockCookies;

std::set<void*> MediaCodec::ResourceManagerServiceProxy::sCookies;



//static

void MediaCodec::ResourceManagerServiceProxy::addCookie(void* cookie) {

    Mutex::Autolock _l(sLockCookies);

    sCookies.insert(cookie);

}



//static

void MediaCodec::ResourceManagerServiceProxy::removeCookie(void* cookie) {

    Mutex::Autolock _l(sLockCookies);

    sCookies.erase(cookie);

}



//static

void MediaCodec::ResourceManagerServiceProxy::BinderDiedCallback(void* cookie) {

    Mutex::Autolock _l(sLockCookies);

    if (sCookies.find(cookie) != sCookies.end()) {

        auto thiz = static_cast<ResourceManagerServiceProxy*>(cookie);

        thiz->binderDied();

    }

}



void MediaCodec::ResourceManagerServiceProxy::binderDied() {

    ALOGW("ResourceManagerService died.");