Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken

* commit '01f78928228cd097bc6816ae03909a2b01d5c1d5':
  Report the requested seek time while seek is in progress.
This commit is contained in:
Andreas Huber
2010-04-07 11:05:56 -07:00
committed by Android Git Automerger
parent 3edc3c56c6 01f7892822
commit 1e6edab620
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/AwesomePlayer.cpp
View File

@@ -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;