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

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

Browse Source 
Merge commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2' into eclair-mr2-plus-aosp

* commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2':
  Fix seek-on-startup behaviour in AwesomePlayer.
This commit is contained in:
Andreas Huber
2009-12-11 09:06:43 -08:00
committed by Android Git Automerger
parent 9ec965e4fb c1d5c921d6
commit 63b3a29d4f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/AwesomePlayer.cpp
View File

@@ -261,6 +261,8 @@ status_t AwesomePlayer::play() {
mFlags |= PLAYING; mFlags |= PLAYING;
mFlags |= FIRST_FRAME; mFlags |= FIRST_FRAME;
bool deferredAudioSeek = false;
if (mAudioSource != NULL) { if (mAudioSource != NULL) {
if (mAudioPlayer == NULL) { if (mAudioPlayer == NULL) {
if (mAudioSink != NULL) { if (mAudioSink != NULL) {
@@ -275,9 +277,7 @@ status_t AwesomePlayer::play() {
delete mTimeSource; delete mTimeSource;
mTimeSource = mAudioPlayer; mTimeSource = mAudioPlayer;
// If there was a seek request while we were paused deferredAudioSeek = true;
// and we're just starting up again, honor the request now.
seekAudioIfNecessary_l();
} }
} else { } else {
mAudioPlayer->resume(); 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; return OK;
} }