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

Commit 63b3a29d authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer. 

Merge commit 'c1d5c921' into eclair-mr2-plus-aosp

* commit 'c1d5c921':
  Fix seek-on-startup behaviour in AwesomePlayer.
parents 9ec965e4 c1d5c921

media/libstagefright/AwesomePlayer.cpp

+9 −3
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ status_t AwesomePlayer::play() { 
    mFlags |= PLAYING;

    mFlags |= FIRST_FRAME;



    bool deferredAudioSeek = false;



    if (mAudioSource != NULL) {

        if (mAudioPlayer == NULL) {

            if (mAudioSink != NULL) {
@@ -275,9 +277,7 @@ status_t AwesomePlayer::play() { 
                delete mTimeSource;

                mTimeSource = mAudioPlayer;



                // If there was a seek request while we were paused

                // and we're just starting up again, honor the request now.

                seekAudioIfNecessary_l();

                deferredAudioSeek = true;

            }

        } else {

            mAudioPlayer->resume();
@@ -299,6 +299,12 @@ status_t AwesomePlayer::play() { 
        }

    }



    if (deferredAudioSeek) {

        // If there was a seek request while we were paused

        // and we're just starting up again, honor the request now.

        seekAudioIfNecessary_l();

    }



    return OK;

}