diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-11-14 06:09:23 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2011-11-14 06:09:23 +0300 |
| commit | f9007940555f055cd41c2f9ffd5dffffa35c7990 (patch) | |
| tree | 7f43549e8b6e348ba964bf75d47207211f72c831 /media | |
| parent | c241a242a31bd26ed1a9e528bbd11fb94683001b (diff) | |
| parent | 38ce282c58c7010b8569dab32b2828a5cdef35e3 (diff) | |
| download | frameworks_base-f9007940555f055cd41c2f9ffd5dffffa35c7990.zip frameworks_base-f9007940555f055cd41c2f9ffd5dffffa35c7990.tar.gz frameworks_base-f9007940555f055cd41c2f9ffd5dffffa35c7990.tar.bz2 | |
Merge "framework/base: Fix for Camera shutter sound heard twice" into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 1c87bd9..d680928 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -941,7 +941,6 @@ status_t AwesomePlayer::play_l() { } } #endif - bool deferredAudioSeek = false; if (mAudioSource != NULL) { if (mAudioPlayer == NULL) { @@ -949,6 +948,10 @@ status_t AwesomePlayer::play_l() { mAudioPlayer = new AudioPlayer(mAudioSink, this); mAudioPlayer->setSource(mAudioSource); + // If there was a seek request while we were paused + // and we're just starting up again, honor the request now. + seekAudioIfNecessary_l(); + // We've already started the MediaSource in order to enable // the prefetcher to read its data. status_t err = mAudioPlayer->start( @@ -970,8 +973,6 @@ status_t AwesomePlayer::play_l() { mTimeSource = mAudioPlayer; - deferredAudioSeek = true; - mWatchForAudioSeekComplete = false; mWatchForAudioEOS = true; } @@ -1007,12 +1008,6 @@ status_t AwesomePlayer::play_l() { postVideoEvent_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... |