diff options
| author | Eric Laurent <elaurent@google.com> | 2010-09-30 17:47:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 17:47:07 -0700 |
| commit | de12c3cf56e3f27b2efc60eeae8b5e422747f2b9 (patch) | |
| tree | cbfc1763688551dc77514f7f6e4d8f07d10b1e7d /media | |
| parent | 4309b52fe19de5241113d8f9ebcdf52741e086a9 (diff) | |
| parent | 220ab8877b234e6807b7f6d9028ba55d23220301 (diff) | |
| download | frameworks_base-de12c3cf56e3f27b2efc60eeae8b5e422747f2b9.zip frameworks_base-de12c3cf56e3f27b2efc60eeae8b5e422747f2b9.tar.gz frameworks_base-de12c3cf56e3f27b2efc60eeae8b5e422747f2b9.tar.bz2 | |
am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp
* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
Issue 3032913: improve AudioTrack recovery time
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 890786e..587c8ff 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -316,6 +316,7 @@ void AudioTrack::start() mNewPosition = mCblk->server + mUpdatePeriod; mCblk->bufferTimeoutMs = MAX_STARTUP_TIMEOUT_MS; mCblk->waitTimeMs = 0; + mCblk->flags &= ~CBLK_DISABLED_ON; if (t != 0) { t->run("AudioTrackThread", THREAD_PRIORITY_AUDIO_CLIENT); } else { @@ -842,6 +843,13 @@ create_new_track: cblk->lock.unlock(); } + // restart track if it was disabled by audioflinger due to previous underrun + if (cblk->flags & CBLK_DISABLED_MSK) { + cblk->flags &= ~CBLK_DISABLED_ON; + LOGW("obtainBuffer() track %p disabled, restarting", this); + mAudioTrack->start(); + } + cblk->waitTimeMs = 0; if (framesReq > framesAvail) { |