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

Commit 5d76e54d authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "NuPlayer: do not create audio decoder if the player is still in... 

Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev
parents 03dee050 566da808

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,9 @@ void NuPlayer::determineAudioModeChange() { 
}



status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {

    if (*decoder != NULL) {

    // The audio decoder could be cleared by tear down. If still in shut down

    // process, no need to create a new audio decoder.

    if (*decoder != NULL || (audio && mFlushingAudio == SHUT_DOWN)) {

        return OK;

    }