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

Commit 01f78928 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo 

Merge commit '567b57b6' into froyo-plus-aosp

* commit '567b57b6':
  Report the requested seek time while seek is in progress.
parents b151f48a 567b57b6

media/libstagefright/AwesomePlayer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -668,7 +668,9 @@ status_t AwesomePlayer::getDuration(int64_t *durationUs) { 
}



status_t AwesomePlayer::getPosition(int64_t *positionUs) {

    if (mVideoSource != NULL) {

    if (mSeeking) {

        *positionUs = mSeekTimeUs;

    } else if (mVideoSource != NULL) {

        Mutex::Autolock autoLock(mMiscStateLock);

        *positionUs = mVideoTimeUs;

    } else if (mAudioPlayer != NULL) {
@@ -710,7 +712,6 @@ void AwesomePlayer::seekAudioIfNecessary_l() { 


        mWatchForAudioSeekComplete = true;

        mWatchForAudioEOS = true;

        mSeeking = false;

        mSeekNotificationSent = false;

    }

}
@@ -1001,6 +1002,8 @@ void AwesomePlayer::onCheckAudioStatus() { 
            notifyListener_l(MEDIA_SEEK_COMPLETE);

            mSeekNotificationSent = true;

        }



        mSeeking = false;

    }



    status_t finalStatus;