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

Commit 2e96e62e authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge \"MediaPlayer: fix state for setPlaybackParams.\" into nyc-dev 

am: d554814b

Change-Id: I370dc96e87250b20d5adaeb32f09df96c105d62d
parents 5f31e40c d554814b

media/libmedia/mediaplayer.cpp

+12 −1
Original line number Diff line number Diff line
@@ -396,11 +396,22 @@ status_t MediaPlayer::setPlaybackSettings(const AudioPlaybackRate& rate) 
    }

    Mutex::Autolock _l(mLock);

    if (mPlayer == 0) return INVALID_OPERATION;



    if (rate.mSpeed != 0.f && !(mCurrentState & MEDIA_PLAYER_STARTED)

            && (mCurrentState & (MEDIA_PLAYER_PREPARED | MEDIA_PLAYER_PAUSED

                    | MEDIA_PLAYER_PLAYBACK_COMPLETE))) {

        mPlayer->setLooping(mLoop);

        mPlayer->setVolume(mLeftVolume, mRightVolume);

        mPlayer->setAuxEffectSendLevel(mSendLevel);

    }



    status_t err = mPlayer->setPlaybackSettings(rate);

    if (err == OK) {

        if (rate.mSpeed == 0.f && mCurrentState == MEDIA_PLAYER_STARTED) {

            mCurrentState = MEDIA_PLAYER_PAUSED;

        } else if (rate.mSpeed != 0.f && mCurrentState == MEDIA_PLAYER_PAUSED) {

        } else if (rate.mSpeed != 0.f

                && (mCurrentState & (MEDIA_PLAYER_PREPARED | MEDIA_PLAYER_PAUSED

                    | MEDIA_PLAYER_PLAYBACK_COMPLETE))) {

            mCurrentState = MEDIA_PLAYER_STARTED;

        }

    }