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

Commit 23c25903 authored by Ronghua Wu's avatar Ronghua Wu Committed by android-build-merger
Browse files

Merge "nuplayer: don\'t resume if player is reseting" am: c5ea4edc 

am: c24b47c3

* commit 'c24b47c3':
  nuplayer: don't resume if player is reseting
parents f2f07456 c24b47c3

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+6 −1
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ NuPlayer::NuPlayer(pid_t pid) 
      mPlaybackSettings(AUDIO_PLAYBACK_RATE_DEFAULT),

      mVideoFpsHint(-1.f),

      mStarted(false),

      mResetting(false),

      mSourceStarted(false),

      mPaused(false),

      mPausedByClient(false),
@@ -1145,6 +1146,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
        {

            ALOGV("kWhatReset");



            mResetting = true;



            mDeferredActions.push_back(

                    new FlushDecoderAction(

                        FLUSH_CMD_SHUTDOWN /* audio */,
@@ -1227,7 +1230,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
}



void NuPlayer::onResume() {

    if (!mPaused) {

    if (!mPaused || mResetting) {

        ALOGD_IF(mResetting, "resetting, onResume discarded");

        return;

    }

    mPaused = false;
@@ -1930,6 +1934,7 @@ void NuPlayer::performReset() { 
    }



    mStarted = false;

    mResetting = false;

    mSourceStarted = false;

}

media/libmediaplayerservice/nuplayer/NuPlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ private: 
    AVSyncSettings mSyncSettings;

    float mVideoFpsHint;

    bool mStarted;

    bool mResetting;

    bool mSourceStarted;



    // Actual pause state, either as requested by client or due to buffering.