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

Commit 4e83083b authored by Hassan Shojania's avatar Hassan Shojania Committed by Android (Google) Code Review
Browse files

Merge "Fix for the occasional prepareDrm/releaseDrm deadlock"

parents 656723b3 69579627

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+1 −5
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ NuPlayerDriver::NuPlayerDriver(pid_t pid) 
      mSeekInProgress(false),

      mSeekInProgress(false),

      mPlayingTimeUs(0),

      mPlayingTimeUs(0),

      mLooper(new ALooper),

      mLooper(new ALooper),

      mPlayer(new NuPlayer(pid)),

      mPlayerFlags(0),

      mPlayerFlags(0),

      mAnalyticsItem(NULL),

      mAnalyticsItem(NULL),

      mAtEOS(false),

      mAtEOS(false),
@@ -66,7 +67,6 @@ NuPlayerDriver::NuPlayerDriver(pid_t pid) 
            true,  /* canCallJava */

            true,  /* canCallJava */

            PRIORITY_AUDIO);

            PRIORITY_AUDIO);





    mPlayer = new NuPlayer(pid);

    mLooper->registerHandler(mPlayer);

    mLooper->registerHandler(mPlayer);





    mPlayer->setDriver(this);

    mPlayer->setDriver(this);
@@ -998,8 +998,6 @@ status_t NuPlayerDriver::prepareDrm(const uint8_t uuid[16], const Vector<uint8_t 
{

{

    ALOGV("prepareDrm(%p) state: %d", this, mState);

    ALOGV("prepareDrm(%p) state: %d", this, mState);





    Mutex::Autolock autoLock(mLock);



    // leaving the state verification for mediaplayer.cpp

    // leaving the state verification for mediaplayer.cpp

    status_t ret = mPlayer->prepareDrm(uuid, drmSessionId);

    status_t ret = mPlayer->prepareDrm(uuid, drmSessionId);
@@ -1012,8 +1010,6 @@ status_t NuPlayerDriver::releaseDrm() 
{

{

    ALOGV("releaseDrm(%p) state: %d", this, mState);

    ALOGV("releaseDrm(%p) state: %d", this, mState);





    Mutex::Autolock autoLock(mLock);



    // leaving the state verification for mediaplayer.cpp

    // leaving the state verification for mediaplayer.cpp

    status_t ret = mPlayer->releaseDrm();

    status_t ret = mPlayer->releaseDrm();

media/libmediaplayerservice/nuplayer/NuPlayerDriver.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ private: 
    // <<<

    // <<<





    sp<ALooper> mLooper;

    sp<ALooper> mLooper;

    sp<NuPlayer> mPlayer;

    const sp<NuPlayer> mPlayer;

    sp<AudioSink> mAudioSink;

    sp<AudioSink> mAudioSink;

    uint32_t mPlayerFlags;

    uint32_t mPlayerFlags;