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

Commit 1e6edab6 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is... 

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

Merge commit '01f78928' into kraken

* commit '01f78928':
  Report the requested seek time while seek is in progress.
parents 3edc3c56 01f78928

media/libstagefright/AwesomePlayer.cpp

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

}





status_t AwesomePlayer::getPosition(int64_t *positionUs) {

status_t AwesomePlayer::getPosition(int64_t *positionUs) {

    if (mVideoSource != NULL) {

    if (mSeeking) {

        *positionUs = mSeekTimeUs;

    } else if (mVideoSource != NULL) {

        Mutex::Autolock autoLock(mMiscStateLock);

        Mutex::Autolock autoLock(mMiscStateLock);

        *positionUs = mVideoTimeUs;

        *positionUs = mVideoTimeUs;

    } else if (mAudioPlayer != NULL) {

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




        mWatchForAudioSeekComplete = true;

        mWatchForAudioSeekComplete = true;

        mWatchForAudioEOS = true;

        mWatchForAudioEOS = true;

        mSeeking = false;

        mSeekNotificationSent = false;

        mSeekNotificationSent = false;

    }

    }

}

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

            notifyListener_l(MEDIA_SEEK_COMPLETE);

            mSeekNotificationSent = true;

            mSeekNotificationSent = true;

        }

        }



        mSeeking = false;

    }

    }





    status_t finalStatus;

    status_t finalStatus;