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

am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1

Browse Source 
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
This commit is contained in:
Andreas Huber
2011-03-16 13:18:42 -07:00
committed by Android Git Automerger
parent 1d8b5a5e86 46956b0691
commit 7532ae7f79
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/libstagefright/AwesomePlayer.cpp
View File

@@ -750,8 +750,6 @@ status_t AwesomePlayer::play_l() {
mFlags |= PLAYING;
mFlags |= FIRST_FRAME;
bool deferredAudioSeek = false;
if (mDecryptHandle != NULL) {
int64_t position;
getPosition(&position);
@@ -767,10 +765,11 @@ status_t AwesomePlayer::play_l() {
mTimeSource = mAudioPlayer;
deferredAudioSeek = true;
mWatchForAudioSeekComplete = false;
mWatchForAudioEOS = true;
// If there was a seek request before we ever started,
// honor the request now.
// Make sure to do this before starting the audio player
// to avoid a race condition.
seekAudioIfNecessary_l();
}
}
@@ -808,12 +807,6 @@ status_t AwesomePlayer::play_l() {
}
}
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();
}
if (mFlags & AT_EOS) {
// Legacy behaviour, if a stream finishes playing and then
// is started again, we play from the start...