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

Commit aaa4dfa3 authored by Wei Jia's avatar Wei Jia
Browse files

NuPlayerDriver: avoid deadlock. 

Test: manually run mediaplayer
Bug: 32524218
Change-Id: I343ce8c1844ae4d8338d9a0d7aaa171462715912
parent 8eacd809

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+10 −6
Original line number Diff line number Diff line
@@ -206,20 +206,24 @@ status_t NuPlayerDriver::setVideoSurfaceTexture( 


status_t NuPlayerDriver::getDefaultBufferingSettings(BufferingSettings* buffering) {

    ALOGV("getDefaultBufferingSettings(%p)", this);

    {

        Mutex::Autolock autoLock(mLock);

        if (mState == STATE_IDLE) {

            return INVALID_OPERATION;

        }

    }



    return mPlayer->getDefaultBufferingSettings(buffering);

}



status_t NuPlayerDriver::setBufferingSettings(const BufferingSettings& buffering) {

    ALOGV("setBufferingSettings(%p)", this);

    {

        Mutex::Autolock autoLock(mLock);

        if (mState == STATE_IDLE) {

            return INVALID_OPERATION;

        }

    }



    return mPlayer->setBufferingSettings(buffering);

}